From 8f34fa96467d0346d223a5e24c42fef4ee0dd948 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 17 Nov 2002 18:59:10 +0000 Subject: [PATCH] *** empty log message *** --- src/SDL.c | 6 +++--- src/audio/openbsd/SDL_openbsdaudio.c | 2 +- src/file/SDL_rwops.c | 2 +- src/video/ps2gs/SDL_gsyuv.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SDL.c b/src/SDL.c index 4aeb04ea1..4609acf69 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -241,8 +241,8 @@ const SDL_version * SDL_Linked_Version(void) return(&version); } -#if defined(_WIN32_WCE) -/* Need to include DllMain() on Windows CE for some reason.. */ +#if defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL)) +/* Need to include DllMain() on Windows CE and Watcom C for some reason.. */ #include BOOL APIENTRY DllMain( HANDLE hModule, @@ -258,4 +258,4 @@ BOOL APIENTRY DllMain( HANDLE hModule, } return TRUE; } -#endif /* _WIN32_WCE */ +#endif /* _WIN32_WCE and building DLL with Watcom C */ diff --git a/src/audio/openbsd/SDL_openbsdaudio.c b/src/audio/openbsd/SDL_openbsdaudio.c index ae892a52f..bc62c5445 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.c +++ b/src/audio/openbsd/SDL_openbsdaudio.c @@ -304,7 +304,7 @@ audio mode : %s (info.mode == AUMODE_PLAY) ? "PLAY" : (info.mode = AUMODE_RECORD) ? "RECORD" : (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL" - : "???")); + : "?")); } #endif /* DEBUG_AUDIO */ diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index f15f6ef49..285557882 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -225,7 +225,7 @@ SDL_RWops *SDL_RWFromFP(FILE *fp, int autoclose) #ifdef WIN32 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);*/ } #endif diff --git a/src/video/ps2gs/SDL_gsyuv.c b/src/video/ps2gs/SDL_gsyuv.c index 4b686a14e..ce4f46d0f 100644 --- a/src/video/ps2gs/SDL_gsyuv.c +++ b/src/video/ps2gs/SDL_gsyuv.c @@ -349,7 +349,7 @@ int GS_DisplayYUVOverlay(_THIS, SDL_Overlay *overlay, SDL_Rect *dstrect) Cr = (Uint32 *)overlay->pixels[2]; Cb = (Uint32 *)overlay->pixels[1]; default: - SDL_SetError("Unsupported YUV format in blit (??)"); + SDL_SetError("Unsupported YUV format in blit (?)"); return(-1); } dst = (Uint32 *)hwdata->ipu_imem;