Commit 5c63a690 authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40544
parent 87040b3a
...@@ -241,8 +241,8 @@ const SDL_version * SDL_Linked_Version(void) ...@@ -241,8 +241,8 @@ const SDL_version * SDL_Linked_Version(void)
return(&version); return(&version);
} }
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL))
/* Need to include DllMain() on Windows CE for some reason.. */ /* Need to include DllMain() on Windows CE and Watcom C for some reason.. */
#include <windows.h> #include <windows.h>
BOOL APIENTRY DllMain( HANDLE hModule, BOOL APIENTRY DllMain( HANDLE hModule,
...@@ -258,4 +258,4 @@ BOOL APIENTRY DllMain( HANDLE hModule, ...@@ -258,4 +258,4 @@ BOOL APIENTRY DllMain( HANDLE hModule,
} }
return TRUE; return TRUE;
} }
#endif /* _WIN32_WCE */ #endif /* _WIN32_WCE and building DLL with Watcom C */
...@@ -304,7 +304,7 @@ audio mode : %s ...@@ -304,7 +304,7 @@ audio mode : %s
(info.mode == AUMODE_PLAY) ? "PLAY" (info.mode == AUMODE_PLAY) ? "PLAY"
: (info.mode = AUMODE_RECORD) ? "RECORD" : (info.mode = AUMODE_RECORD) ? "RECORD"
: (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL" : (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL"
: "???")); : "?"));
} }
#endif /* DEBUG_AUDIO */ #endif /* DEBUG_AUDIO */
......
...@@ -225,7 +225,7 @@ SDL_RWops *SDL_RWFromFP(FILE *fp, int autoclose) ...@@ -225,7 +225,7 @@ SDL_RWops *SDL_RWFromFP(FILE *fp, int autoclose)
#ifdef WIN32 #ifdef WIN32
if ( ! in_sdl ) { if ( ! in_sdl ) {
SDL_SetError("You can't pass a FILE pointer to a DLL (??)"); SDL_SetError("You can't pass a FILE pointer to a DLL (?)");
/*return(NULL);*/ /*return(NULL);*/
} }
#endif #endif
......
...@@ -349,7 +349,7 @@ int GS_DisplayYUVOverlay(_THIS, SDL_Overlay *overlay, SDL_Rect *dstrect) ...@@ -349,7 +349,7 @@ int GS_DisplayYUVOverlay(_THIS, SDL_Overlay *overlay, SDL_Rect *dstrect)
Cr = (Uint32 *)overlay->pixels[2]; Cr = (Uint32 *)overlay->pixels[2];
Cb = (Uint32 *)overlay->pixels[1]; Cb = (Uint32 *)overlay->pixels[1];
default: default:
SDL_SetError("Unsupported YUV format in blit (??)"); SDL_SetError("Unsupported YUV format in blit (?)");
return(-1); return(-1);
} }
dst = (Uint32 *)hwdata->ipu_imem; dst = (Uint32 *)hwdata->ipu_imem;
......
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