From c7204a5f83b624ea269544d62d310359619c1d77 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 26 Feb 2006 19:37:40 +0000 Subject: [PATCH] Fixed some OpenWatcom warnings --- src/thread/os2/SDL_systhread.c | 2 +- src/video/SDL_blit_A.c | 18 ++++++++++-------- src/video/SDL_blit_N.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/thread/os2/SDL_systhread.c b/src/thread/os2/SDL_systhread.c index 3c4e1ac74..5a174d928 100644 --- a/src/thread/os2/SDL_systhread.c +++ b/src/thread/os2/SDL_systhread.c @@ -72,7 +72,7 @@ int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThre pThreadParms->args = args; // Start the thread using the runtime library of calling app! thread->threadid = thread->handle = (*pfnBeginThread)(threadfunc, NULL, 512*1024, pThreadParms); - if (thread->threadid<=0) + if ((int)thread->threadid <= 0) { SDL_SetError("Not enough resources to create thread"); return(-1); diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index 61c911086..e94fdf66e 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -1468,10 +1468,11 @@ static void Blit16to16SurfaceAlpha128(SDL_BlitInfo *info, Uint16 mask) Uint32 sw, dw, s; sw = *(Uint32 *)srcp; dw = *(Uint32 *)dstp; - if(SDL_BYTEORDER == SDL_BIG_ENDIAN) - s = (prev_sw << 16) + (sw >> 16); - else - s = (prev_sw >> 16) + (sw << 16); +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + s = (prev_sw << 16) + (sw >> 16); +#else + s = (prev_sw >> 16) + (sw << 16); +#endif prev_sw = sw; *(Uint32 *)dstp = BLEND2x16_50(dw, s, mask); dstp += 2; @@ -1482,10 +1483,11 @@ static void Blit16to16SurfaceAlpha128(SDL_BlitInfo *info, Uint16 mask) /* final pixel if any */ if(w) { Uint16 d = *dstp, s; - if(SDL_BYTEORDER == SDL_BIG_ENDIAN) - s = (Uint16)prev_sw; - else - s = (Uint16)(prev_sw >> 16); +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + s = (Uint16)prev_sw; +#else + s = (Uint16)(prev_sw >> 16); +#endif *dstp = BLEND16_50(d, s, mask); srcp++; dstp++; diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index 33117056b..53587de70 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -835,10 +835,10 @@ static Uint32 GetBlitFeatures( void ) #endif /* This is now endian dependent */ -#if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) +#if SDL_BYTEORDER == SDL_LIL_ENDIAN #define HI 1 #define LO 0 -#else /* ( SDL_BYTEORDER == SDL_BIG_ENDIAN ) */ +#else /* SDL_BYTEORDER == SDL_BIG_ENDIAN */ #define HI 0 #define LO 1 #endif