mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix warning new since stdint.h change

This commit is contained in:
Jay Sorg 2017-02-01 21:42:37 -08:00 committed by jsorg71
parent 2424a9c020
commit 7825246d7a
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/list.c
View File

@ -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));
}
}

2
common/log.c
View File

@ -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)

4
libxrdp/libxrdpinc.h
View File

@ -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;

5
xrdp/xrdp.h
View File

@ -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

3
xrdp/xrdp_wm.c
View File

@ -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;

2
xup/xup.c
View File

@ -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;
}