A few fixes for pointer qualifiers (const, volatile) warnings.

This commit is contained in:
Eric Pouech 2006-02-06 13:10:18 +01:00 committed by Alexandre Julliard
parent e3ebb3aab9
commit 3c0e5eed83
3 changed files with 6 additions and 6 deletions

View File

@ -2284,7 +2284,7 @@ static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *de
: "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" );
return ret; return ret;
#else #else
return (PVOID)InterlockedCompareExchange( (PLONG)dest, (LONG)xchg, (LONG)compare ); return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare );
#endif #endif
} }
@ -2296,7 +2296,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVO
: "=r" (ret) :"r" (dest), "0" (val) : "memory" ); : "=r" (ret) :"r" (dest), "0" (val) : "memory" );
return ret; return ret;
#else #else
return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val ); return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val );
#endif #endif
} }

View File

@ -156,7 +156,7 @@ static const union cptable * const cptables[60] =
static int cmp_codepage( const void *codepage, const void *entry ) static int cmp_codepage( const void *codepage, const void *entry )
{ {
return *(unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage; return *(const unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage;
} }

View File

@ -465,7 +465,7 @@ static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg)
static int sort_lanmsg(const void *p1, const void *p2) static int sort_lanmsg(const void *p1, const void *p2)
{ {
return (*(lanmsg_t **)p1)->lan - (*(lanmsg_t **)p2)->lan; return (*(const lanmsg_t * const *)p1)->lan - (*(const lanmsg_t * const*)p2)->lan;
} }
static msg_t *complete_msg(msg_t *mp, int id) static msg_t *complete_msg(msg_t *mp, int id)
@ -563,7 +563,7 @@ static int check_languages(node_t *head)
return nm; return nm;
} }
#define MSGRID(x) ((*(msg_t **)(x))->realid) #define MSGRID(x) ((*(const msg_t * const*)(x))->realid)
static int sort_msg(const void *p1, const void *p2) static int sort_msg(const void *p1, const void *p2)
{ {
return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1); return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1);
@ -653,7 +653,7 @@ static lan_blk_t *block_messages(node_t *head)
static int sc_xlat(const void *p1, const void *p2) static int sc_xlat(const void *p1, const void *p2)
{ {
return ((cp_xlat_t *)p1)->lan - ((cp_xlat_t *)p2)->lan; return ((const cp_xlat_t *)p1)->lan - ((const cp_xlat_t *)p2)->lan;
} }
static void add_cpxlat(int lan, int cpin, int cpout) static void add_cpxlat(int lan, int cpin, int cpout)