encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move SDL_tcsstr definition to core/windows/SDL_windows.h

This commit is contained in:
Ozkan Sezer 2021-01-04 08:50:00 +03:00
parent f414a43632
commit f2bd861cd7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/windows/SDL_windows.h
View File

@ -47,6 +47,12 @@
#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)(S), SDL_strlen(S)+1) #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#endif #endif
#ifdef UNICODE
#define SDL_tcsstr SDL_wcsstr
#else
#define SDL_tcsstr SDL_strstr
#endif
/* Sets an error message based on a given HRESULT */ /* Sets an error message based on a given HRESULT */
extern int WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr); extern int WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr);

6
src/joystick/windows/SDL_dinputjoystick.c
View File

@ -232,12 +232,6 @@ SetDIerror(const char *function, HRESULT code)
return SDL_SetError("%s() DirectX error 0x%8.8lx", function, code); return SDL_SetError("%s() DirectX error 0x%8.8lx", function, code);
} }
#ifdef UNICODE
#define SDL_tcsstr SDL_wcsstr
#else
#define SDL_tcsstr SDL_strstr
#endif
#if 0 /* Microsoft recommended implementation, but slower than checking raw devices */ #if 0 /* Microsoft recommended implementation, but slower than checking raw devices */
#define COBJMACROS #define COBJMACROS
#include <wbemidl.h> #include <wbemidl.h>