Browse Source

move SDL_tcsstr definition to core/windows/SDL_windows.h

Ozkan Sezer 4 years ago
parent
commit
f2bd861cd7
2 changed files with 6 additions and 6 deletions
  1. 6 0
      src/core/windows/SDL_windows.h
  2. 0 6
      src/joystick/windows/SDL_dinputjoystick.c

+ 6 - 0
src/core/windows/SDL_windows.h

@@ -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);
 
 

+ 0 - 6
src/joystick/windows/SDL_dinputjoystick.c

@@ -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>