From 104642ffe79fd599b185272b4a349014f27e4550 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 6 Sep 2024 08:57:40 -0700
Subject: [PATCH] Sorted API symbols
---
src/dynapi/SDL_dynapi.sym | 6 +++---
src/dynapi/SDL_dynapi_overrides.h | 6 +++---
src/dynapi/SDL_dynapi_procs.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym
index 6c6aa7695c216..e2259e16c63c0 100644
--- a/src/dynapi/SDL_dynapi.sym
+++ b/src/dynapi/SDL_dynapi.sym
@@ -117,8 +117,6 @@ SDL3_0.0.0 {
SDL_CreateWindowWithProperties;
SDL_CursorVisible;
SDL_DateTimeToTime;
- SDL_RemoveEventWatch;
- SDL_RemoveHintCallback;
SDL_Delay;
SDL_DelayNS;
SDL_DestroyAudioStream;
@@ -703,6 +701,8 @@ SDL3_0.0.0 {
SDL_ReleaseGPUTransferBuffer;
SDL_ReleaseWindowFromGPUDevice;
SDL_ReloadGamepadMappings;
+ SDL_RemoveEventWatch;
+ SDL_RemoveHintCallback;
SDL_RemovePath;
SDL_RemoveStoragePath;
SDL_RemoveSurfaceAlternateImages;
@@ -1104,6 +1104,7 @@ SDL3_0.0.0 {
SDL_strndup;
SDL_strnlen;
SDL_strnstr;
+ SDL_strpbrk;
SDL_strrchr;
SDL_strrev;
SDL_strstr;
@@ -1144,7 +1145,6 @@ SDL3_0.0.0 {
SDL_wcsnstr;
SDL_wcsstr;
SDL_wcstol;
- SDL_strpbrk;
# extra symbols go here (don't modify this line)
local: *;
};
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index f0e1118c69755..a3ae76136bf80 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -142,8 +142,6 @@
#define SDL_CreateWindowWithProperties SDL_CreateWindowWithProperties_REAL
#define SDL_CursorVisible SDL_CursorVisible_REAL
#define SDL_DateTimeToTime SDL_DateTimeToTime_REAL
-#define SDL_RemoveEventWatch SDL_RemoveEventWatch_REAL
-#define SDL_RemoveHintCallback SDL_RemoveHintCallback_REAL
#define SDL_Delay SDL_Delay_REAL
#define SDL_DelayNS SDL_DelayNS_REAL
#define SDL_DestroyAudioStream SDL_DestroyAudioStream_REAL
@@ -728,6 +726,8 @@
#define SDL_ReleaseGPUTransferBuffer SDL_ReleaseGPUTransferBuffer_REAL
#define SDL_ReleaseWindowFromGPUDevice SDL_ReleaseWindowFromGPUDevice_REAL
#define SDL_ReloadGamepadMappings SDL_ReloadGamepadMappings_REAL
+#define SDL_RemoveEventWatch SDL_RemoveEventWatch_REAL
+#define SDL_RemoveHintCallback SDL_RemoveHintCallback_REAL
#define SDL_RemovePath SDL_RemovePath_REAL
#define SDL_RemoveStoragePath SDL_RemoveStoragePath_REAL
#define SDL_RemoveSurfaceAlternateImages SDL_RemoveSurfaceAlternateImages_REAL
@@ -1129,6 +1129,7 @@
#define SDL_strndup SDL_strndup_REAL
#define SDL_strnlen SDL_strnlen_REAL
#define SDL_strnstr SDL_strnstr_REAL
+#define SDL_strpbrk SDL_strpbrk_REAL
#define SDL_strrchr SDL_strrchr_REAL
#define SDL_strrev SDL_strrev_REAL
#define SDL_strstr SDL_strstr_REAL
@@ -1169,4 +1170,3 @@
#define SDL_wcsnstr SDL_wcsnstr_REAL
#define SDL_wcsstr SDL_wcsstr_REAL
#define SDL_wcstol SDL_wcstol_REAL
-#define SDL_strpbrk SDL_strpbrk_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index b4c4e3062011a..b80ddf874ca6a 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -1136,6 +1136,7 @@ SDL_DYNAPI_PROC(int,SDL_strncmp,(const char *a, const char *b, size_t c),(a,b,c)
SDL_DYNAPI_PROC(char*,SDL_strndup,(const char *a, size_t b),(a,b),return)
SDL_DYNAPI_PROC(size_t,SDL_strnlen,(const char *a, size_t b),(a,b),return)
SDL_DYNAPI_PROC(char*,SDL_strnstr,(const char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_strpbrk,(const char *a, const char *b),(a,b),return)
SDL_DYNAPI_PROC(char*,SDL_strrchr,(const char *a, int b),(a,b),return)
SDL_DYNAPI_PROC(char*,SDL_strrev,(char *a),(a),return)
SDL_DYNAPI_PROC(char*,SDL_strstr,(const char *a, const char *b),(a,b),return)
@@ -1175,4 +1176,3 @@ SDL_DYNAPI_PROC(size_t,SDL_wcsnlen,(const wchar_t *a, size_t b),(a,b),return)
SDL_DYNAPI_PROC(wchar_t*,SDL_wcsnstr,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
SDL_DYNAPI_PROC(wchar_t*,SDL_wcsstr,(const wchar_t *a, const wchar_t *b),(a,b),return)
SDL_DYNAPI_PROC(long,SDL_wcstol,(const wchar_t *a, wchar_t **b, int c),(a,b,c),return)
-SDL_DYNAPI_PROC(char*,SDL_strpbrk,(const char *a, const char *b),(a,b),return)