Mercurial > sdl-ios-xcode
diff src/SDL_assert.c @ 5092:327f181542f1
Include windows.h in a single point in the source, so we can be consistent about the definition of UNICODE and have core utility functions for Windows that all modules can share.
I think this also fixes the bug relating to non-latin characters in filenames, since UNICODE wasn't defined in SDL_rwops.c
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 24 Jan 2011 21:20:30 -0800 |
| parents | c2539ff054c8 |
| children | b530ef003506 |
line wrap: on
line diff
--- a/src/SDL_assert.c Mon Jan 24 17:47:18 2011 -0800 +++ b/src/SDL_assert.c Mon Jan 24 21:20:30 2011 -0800 @@ -27,18 +27,11 @@ #include "video/SDL_sysvideo.h" #ifdef __WIN32__ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "core/windows/SDL_windows.h" #ifndef WS_OVERLAPPEDWINDOW #define WS_OVERLAPPEDWINDOW 0 #endif - -#ifdef UNICODE -#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1) -#else -#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1) -#endif #else /* fprintf, _exit(), etc. */ #include <stdio.h> #include <stdlib.h>