From 9947ef59390e0a0d37ac05108c89a1c7d71ae018 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 3 Jul 2023 17:01:10 +0300
Subject: [PATCH] update after SDL_strtokr -> SDL_strtok_r rename in SDL3.
---
src/sdl3_include_wrapper.h | 10 ++++------
src/sdl3_syms.h | 4 +---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index 71dade2..9f3364a 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -862,7 +862,7 @@
#define SDL_strrev IGNORE_THIS_VERSION_OF_SDL_strrev
#define SDL_strstr IGNORE_THIS_VERSION_OF_SDL_strstr
#define SDL_strtod IGNORE_THIS_VERSION_OF_SDL_strtod
-#define SDL_strtokr IGNORE_THIS_VERSION_OF_SDL_strtokr
+#define SDL_strtok_r IGNORE_THIS_VERSION_OF_SDL_strtok_r
#define SDL_strtol IGNORE_THIS_VERSION_OF_SDL_strtol
#define SDL_strtoll IGNORE_THIS_VERSION_OF_SDL_strtoll
#define SDL_strtoul IGNORE_THIS_VERSION_OF_SDL_strtoul
@@ -4289,8 +4289,8 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_strtod
#endif
-#ifdef SDL_strtokr
-#undef SDL_strtokr
+#ifdef SDL_strtok_r
+#undef SDL_strtok_r
#endif
#ifdef SDL_strtol
@@ -4516,6 +4516,4 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_iOSSetEventPump
#endif
-#endif
-
-/* vi: set ts=4 sw=4 expandtab: */
+#endif /* INCL_SDL3_INCLUDE_WRAPPER_H */
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 625b876..d0d7b53 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -693,7 +693,7 @@ SDL3_SYM_PASSTHROUGH(SDL_MetalView,Metal_CreateView,(SDL_Window *a),(a),return)
SDL3_SYM_PASSTHROUGH(void,Metal_DestroyView,(SDL_MetalView a),(a),)
SDL3_SYM_PASSTHROUGH(int,LockTextureToSurface,(SDL_Texture *a, const SDL_Rect *b, SDL_Surface **c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(SDL_bool,HasARMSIMD,(void),(),return)
-SDL3_SYM_PASSTHROUGH(char*,strtokr,(char *a, const char *b, char **c),(a,b,c),return)
+SDL3_SYM_RENAMED(char*,strtokr,strtok_r,(char *a, const char *b, char **c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(wchar_t*,wcsstr,(const wchar_t *a, const wchar_t *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(int,wcsncmp,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
SDL3_SYM_RENAMED(SDL_GameControllerType,GameControllerGetType,GetGamepadType,(SDL_GameController *a),(a),return)
@@ -918,5 +918,3 @@ SDL3_SYM_PASSTHROUGH(int,DestroyWindowSurface,(SDL_Window *a),(a),return)
#undef SDL3_SYM_PASSTHROUGH
#undef SDL3_SYM_RENAMED
#undef SDL3_SYM_VARARGS
-
-/* vi: set ts=4 sw=4 expandtab: */