jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some ints should be long

Browse Source
This commit is contained in:
jsorg71 2005-03-08 03:31:14 +00:00
parent d5dea39baf
commit 777893bdd6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/os_calls.c
View File

@ -870,17 +870,17 @@ int g_strcmp(char* c1, char* c2)
} }
/*****************************************************************************/ /*****************************************************************************/
int g_load_library(char* in) long g_load_library(char* in)
{ {
#if defined(_WIN32) #if defined(_WIN32)
return 0; return 0;
#else #else
return (int)dlopen(in, RTLD_LOCAL | RTLD_LAZY); return (long)dlopen(in, RTLD_LOCAL | RTLD_LAZY);
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/
int g_free_library(int lib) int g_free_library(long lib)
{ {
if (lib == 0) if (lib == 0)
{ {
@ -895,7 +895,7 @@ int g_free_library(int lib)
/*****************************************************************************/ /*****************************************************************************/
/* returns NULL if not found */ /* returns NULL if not found */
void* g_get_proc_address(int lib, char* name) void* g_get_proc_address(long lib, char* name)
{ {
if (lib == 0) if (lib == 0)
{ {

6
common/parse.h
View File

@ -160,7 +160,7 @@ struct stream
#if defined(B_ENDIAN) || defined(NEED_ALIGN) #if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define in_uint32_le(s, v) \ #define in_uint32_le(s, v) \
{ \ { \
v = (unsigned long) \ v = (unsigned int) \
( \ ( \
(*((unsigned char*)(s->p + 0)) << 0) | \ (*((unsigned char*)(s->p + 0)) << 0) | \
(*((unsigned char*)(s->p + 1)) << 8) | \ (*((unsigned char*)(s->p + 1)) << 8) | \
@ -172,7 +172,7 @@ struct stream
#else #else
#define in_uint32_le(s, v) \ #define in_uint32_le(s, v) \
{ \ { \
v = *((unsigned long*)(s->p)); \ v = *((unsigned int*)(s->p)); \
s->p += 4; \ s->p += 4; \
} }
#endif #endif
@ -242,7 +242,7 @@ struct stream
#else #else
#define out_uint32_le(s, v) \ #define out_uint32_le(s, v) \
{ \ { \
*((unsigned long*)(s->p)) = (v); \ *((unsigned int*)(s->p)) = (v); \
s->p += 4; \ s->p += 4; \
} }
#endif #endif

2
xrdp/xrdp_types.h
View File

@ -398,7 +398,7 @@ struct xrdp_wm
int scroll_lock; int scroll_lock;
int num_lock; int num_lock;
/* mod vars */ /* mod vars */
int mod_handle; /* returned from g_load_library */ long mod_handle; /* returned from g_load_library */
struct xrdp_mod* (*mod_init)(void); struct xrdp_mod* (*mod_init)(void);
int (*mod_exit)(struct xrdp_mod*); int (*mod_exit)(struct xrdp_mod*);
struct xrdp_mod* mod; struct xrdp_mod* mod;

2
xrdp/xrdp_wm.c
View File

@ -67,6 +67,8 @@ void xrdp_wm_delete(struct xrdp_wm* self)
{ {
g_free_library(self->mod_handle); g_free_library(self->mod_handle);
} }
/* free the log */
xrdp_list_delete(self->log);
/* free self */ /* free self */
g_free(self); g_free(self);
} }