Commit 7e4c88c6 authored by Alexandre Julliard's avatar Alexandre Julliard

Avoid some warnings on 64-bit platforms.

parent e17ef695
......@@ -87,7 +87,7 @@ extern void wine_ldt_init_locking( void (*lock_func)(void), void (*unlock_func)(
extern void wine_ldt_get_entry( unsigned short sel, LDT_ENTRY *entry );
extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry );
extern int wine_ldt_is_system( unsigned short sel );
extern void *wine_ldt_get_ptr( unsigned short sel, unsigned int offset );
extern void *wine_ldt_get_ptr( unsigned short sel, unsigned long offset );
extern unsigned short wine_ldt_alloc_entries( int count );
extern unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount );
extern void wine_ldt_free_entries( unsigned short sel, int count );
......
......@@ -93,7 +93,7 @@ struct wine_pthread_thread_info
int pid; /* Unix process id */
int tid; /* Unix thread id */
void (*entry)( struct wine_pthread_thread_info *info ); /* thread entry point */
int exit_status; /* thread exit status when calling wine_pthread_exit_thread */
long exit_status; /* thread exit status when calling wine_pthread_exit_thread */
};
struct wine_pthread_functions
......@@ -104,7 +104,7 @@ struct wine_pthread_functions
void (*init_current_teb)( struct wine_pthread_thread_info *info );
void * (*get_current_teb)(void);
void (* DECLSPEC_NORETURN exit_thread)( struct wine_pthread_thread_info *info );
void (* DECLSPEC_NORETURN abort_thread)( int status );
void (* DECLSPEC_NORETURN abort_thread)( long status );
};
extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size );
......
......@@ -156,7 +156,7 @@ static const union cptable * const cptables[60] =
static int cmp_codepage( const void *codepage, const void *entry )
{
return (unsigned int)codepage - (*(const union cptable *const *)entry)->info.codepage;
return *(unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage;
}
......@@ -165,7 +165,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage )
{
const union cptable **res;
if (!(res = bsearch( (void *)codepage, cptables, NB_CODEPAGES,
if (!(res = bsearch( &codepage, cptables, NB_CODEPAGES,
sizeof(cptables[0]), cmp_codepage ))) return NULL;
return *res;
}
......
......@@ -295,7 +295,7 @@ int wine_ldt_is_system( unsigned short sel )
* Convert a segment:offset pair to a linear pointer.
* Note: we don't lock the LDT since this has to be fast.
*/
void *wine_ldt_get_ptr( unsigned short sel, unsigned int offset )
void *wine_ldt_get_ptr( unsigned short sel, unsigned long offset )
{
int index;
......
......@@ -377,7 +377,7 @@ static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info
/***********************************************************************
* abort_thread
*/
static void DECLSPEC_NORETURN abort_thread( int status )
static void DECLSPEC_NORETURN abort_thread( long status )
{
#ifdef HAVE__LWP_CREATE
_lwp_exit();
......
......@@ -157,7 +157,7 @@ static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info
/***********************************************************************
* abort_thread
*/
static void DECLSPEC_NORETURN abort_thread( int status )
static void DECLSPEC_NORETURN abort_thread( long status )
{
pthread_exit( (void *)status );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment