From 7825246d7a1421677a7cd6b6cfcad089bfc81d11 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Wed, 1 Feb 2017 21:42:37 -0800
Subject: [PATCH] fix warning new since stdint.h change

---
 common/list.c        | 2 +-
 common/log.c         | 2 +-
 libxrdp/libxrdpinc.h | 4 ++--
 xrdp/xrdp.h          | 5 +++--
 xrdp/xrdp_wm.c       | 3 ++-
 xup/xup.c            | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/list.c b/common/list.c
index 47b15737..0a989a1d 100644
--- a/common/list.c
+++ b/common/list.c
@@ -221,6 +221,6 @@ list_dump_items(struct list *self)
 
     for (index = 0; index < self->count; index++)
     {
-        g_writeln("%d: 0x%lx", index, list_get_item(self, index));
+        g_writeln("%d: 0x%lx", index, (long) list_get_item(self, index));
     }
 }
diff --git a/common/log.c b/common/log.c
index 86935acd..103aae80 100644
--- a/common/log.c
+++ b/common/log.c
@@ -592,7 +592,7 @@ log_message(const enum logLevels lvl, const char *msg, ...)
         /* log to syslog*/
         /* %s fix compiler warning 'not a string literal' */
         syslog(internal_log_xrdp2syslog(lvl), "(%d)(%ld)%s", g_getpid(),
-               tc_get_threadid(), buff + 20);
+               (long) tc_get_threadid(), buff + 20);
     }
 
     if (lvl <= g_staticLogConfig->log_level)
diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h
index bd4f89dc..86ec8201 100644
--- a/libxrdp/libxrdpinc.h
+++ b/libxrdp/libxrdpinc.h
@@ -64,8 +64,8 @@ struct xrdp_session
 {
     tintptr id;
     struct trans *trans;
-    int (*callback)(tintptr id, int msg, tintptr param1, tintptr param2,
-                    tintptr param3, tintptr param4);
+    int (*callback)(intptr_t id, int msg, intptr_t param1, intptr_t param2,
+                    intptr_t param3, intptr_t param4);
     void *rdp;
     void *orders;
     struct xrdp_client_info *client_info;
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index a84a4c07..13bd398c 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -134,8 +134,9 @@ xrdp_wm_send_pointer(struct xrdp_wm* self, int cache_idx,
 int APP_CC
 xrdp_wm_pointer(struct xrdp_wm* self, char* data, char* mask, int x, int y,
                 int bpp);
-int
-callback(long id, int msg, long param1, long param2, long param3, long param4);
+int DEFAULT_CC
+callback(intptr_t id, int msg, intptr_t param1, intptr_t param2,
+         intptr_t param3, intptr_t param4);
 int APP_CC
 xrdp_wm_delete_all_children(struct xrdp_wm* self);
 int APP_CC
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 9db41c0b..9b55c5bd 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -1744,7 +1744,8 @@ xrdp_wm_process_channel_data(struct xrdp_wm *self,
 /******************************************************************************/
 /* this is the callbacks coming from libxrdp.so */
 int DEFAULT_CC
-callback(long id, int msg, long param1, long param2, long param3, long param4)
+callback(intptr_t id, int msg, intptr_t param1, intptr_t param2,
+         intptr_t param3, intptr_t param4)
 {
     int rv;
     struct xrdp_wm *wm;
diff --git a/xup/xup.c b/xup/xup.c
index bff29727..65ccc34c 100644
--- a/xup/xup.c
+++ b/xup/xup.c
@@ -212,7 +212,7 @@ lib_mod_connect(struct mod *mod)
         if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0)
         {
             LLOGLN(0, ("lib_mod_connect: connected to Xserver "
-                   "(Xorg or X11rdp) sck %ld", mod->trans->sck));
+                   "(Xorg or X11rdp) sck %ld", (long) (mod->trans->sck)));
             error = 0;
         }