From 35695bdfd19469fa5a86fb9692887bffb63828bd Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 24 Jan 2024 06:29:24 +0300
Subject: [PATCH] update platform macros after latest SDL3
---
src/dynapi/SDL_dynapi.c | 14 ++++----
src/dynapi/SDL_dynapi.h | 16 +++++-----
src/dynapi/SDL_dynapi_procs.h | 56 ++++++++++++++++----------------
src/sdl2_compat.c | 15 +++++----
src/sdl2_compat.h | 2 +-
src/sdl2_protos.h | 60 +++++++++++++++++------------------
src/sdl3_syms.h | 17 +++++-----
7 files changed, 89 insertions(+), 91 deletions(-)
diff --git a/src/dynapi/SDL_dynapi.c b/src/dynapi/SDL_dynapi.c
index 3e07976..50e4791 100644
--- a/src/dynapi/SDL_dynapi.c
+++ b/src/dynapi/SDL_dynapi.c
@@ -28,7 +28,7 @@
#define SDL_DYNAMIC_API_ENVVAR "SDL_DYNAMIC_API"
-#if defined(__OS2__)
+#if defined(SDL_PLATFORM_OS2)
#define INCL_DOS
#define INCL_DOSERRORS
#include <os2.h>
@@ -358,7 +358,7 @@ Sint32 SDL_DYNAPI_entry(Uint32 apiver, void *table, Uint32 tablesize)
/* Obviously we can't use SDL_LoadObject() to load SDL. :) */
/* Also obviously, we never close the loaded library. */
-#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_CYGWIN)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
@@ -376,7 +376,7 @@ static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
return retval;
}
-#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__QNX__)
+#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(SDL_PLATFORM_HAIKU) || defined(SDL_PLATFORM_QNX)
#include <stdio.h>
#include <stdlib.h>
#include <dlfcn.h>
@@ -393,7 +393,7 @@ static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
return retval;
}
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
{
HMODULE hmodule;
@@ -415,7 +415,7 @@ static void dynapi_warn(const char *msg)
{
const char *caption = "SDL Dynamic API Failure!";
/* SDL_ShowSimpleMessageBox() is a too heavy for here. */
-#if (defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)) && !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
+#if (defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_CYGWIN)) && !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
MessageBoxA(NULL, msg, caption, MB_OK | MB_ICONERROR);
#else
fprintf(stderr, "\n\n%s\n%s\n\n", caption, msg);
@@ -432,9 +432,9 @@ DynApiExitProcess(int exitcode)
#if defined(_WIN32)
TerminateProcess(GetCurrentProcess(), exitcode);
ExitProcess(exitcode);
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
DosExit(EXIT_PROCESS, exitcode);
-#elif defined(__HAIKU__) /* Haiku has _Exit, but it's not marked noreturn. */
+#elif defined(SDL_PLATFORM_HAIKU) /* Haiku has _Exit, but it's not marked noreturn. */
_exit(exitcode);
#else
_Exit(exitcode); /* this (currently) covers everything else. */
diff --git a/src/dynapi/SDL_dynapi.h b/src/dynapi/SDL_dynapi.h
index 95b20aa..0f02e12 100644
--- a/src/dynapi/SDL_dynapi.h
+++ b/src/dynapi/SDL_dynapi.h
@@ -45,27 +45,27 @@
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE /* probably not useful on iOS. */
#define SDL_DYNAMIC_API 0
-#elif defined(__ANDROID__) /* probably not useful on Android. */
+#elif defined(SDL_PLATFORM_ANDROID) /* probably not useful on Android. */
#define SDL_DYNAMIC_API 0
#elif defined(__native_client__) && __native_client__ /* probably not useful on NACL. */
#define SDL_DYNAMIC_API 0
-#elif defined(__EMSCRIPTEN__) && __EMSCRIPTEN__ /* probably not useful on Emscripten. */
+#elif defined(SDL_PLATFORM_EMSCRIPTEN) /* probably not useful on Emscripten. */
#define SDL_DYNAMIC_API 0
#elif defined(SDL_BUILDING_WINRT) && SDL_BUILDING_WINRT /* probably not useful on WinRT, given current .dll loading restrictions */
#define SDL_DYNAMIC_API 0
-#elif defined(__PS2__)
+#elif defined(SDL_PLATFORM_PS2)
#define SDL_DYNAMIC_API 0
-#elif defined(__PSP__) && __PSP__
+#elif defined(SDL_PLATFORM_PSP) && SDL_PLATFORM_PSP
#define SDL_DYNAMIC_API 0
-#elif defined(__riscos__) && __riscos__ /* probably not useful on RISC OS, since dlopen() can't be used when using static linking. */
+#elif defined(SDL_PLATFORM_RISCOS) /* probably not useful on RISC OS, since dlopen() can't be used when using static linking. */
#define SDL_DYNAMIC_API 0
#elif defined(__clang_analyzer__) || defined(SDL_THREAD_SAFETY_ANALYSIS)
#define SDL_DYNAMIC_API 0 /* Turn off for static analysis, so reports are more clear. */
-#elif defined(__VITA__)
+#elif defined(SDL_PLATFORM_VITA)
#define SDL_DYNAMIC_API 0 /* vitasdk doesn't support dynamic linking */
-#elif defined(__NGAGE__)
+#elif defined(SDL_PLATFORM_NGAGE)
#define SDL_DYNAMIC_API 0 /* The N-Gage doesn't support dynamic linking either */
-#elif defined(__3DS__)
+#elif defined(SDL_PLATFORM_3DS)
#define SDL_DYNAMIC_API 0 /* devkitARM doesn't support dynamic linking */
#elif defined(DYNAPI_NEEDS_DLOPEN) && !defined(HAVE_DLOPEN)
#define SDL_DYNAMIC_API 0 /* we need dlopen(), but don't have it.... */
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 1edac92..ec1877e 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -47,10 +47,9 @@ SDL_DYNAPI_PROC(int,SDL_snprintf,(SDL_OUT_Z_CAP(b) char *a, size_t b, SDL_PRINTF
#ifdef SDL_CreateThread
#undef SDL_CreateThread
#endif
-
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e),(a,b,c,d,e),return)
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e),(a,b,c,d,e),return)
#else
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThread,(SDL_ThreadFunction a, const char *b, void *c),(a,b,c),return)
@@ -62,22 +61,22 @@ SDL_DYNAPI_PROC(SDL2_RWops*,SDL_RWFromFP,(FILE *a, SDL_bool b),(a,b),return)
SDL_DYNAPI_PROC(SDL2_RWops*,SDL_RWFromFP,(void *a, SDL_bool b),(a,b),return)
#endif
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(int,SDL_RegisterApp,(const char *a, Uint32 b, void *c),(a,b,c),return)
SDL_DYNAPI_PROC(void,SDL_UnregisterApp,(void),(),)
#endif
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL_DYNAPI_PROC(int,SDL_Direct3D9GetAdapterIndex,(int a),(a),return)
SDL_DYNAPI_PROC(IDirect3DDevice9*,SDL_RenderGetD3D9Device,(SDL_Renderer *a),(a),return)
#endif
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL_DYNAPI_PROC(int,SDL_iPhoneSetAnimationCallback,(SDL_Window *a, int b, void (SDLCALL *c)(void *), void *d),(a,b,c,d),return)
SDL_DYNAPI_PROC(void,SDL_iPhoneSetEventPump,(SDL_bool a),(a),)
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(void*,SDL_AndroidGetJNIEnv,(void),(),return)
SDL_DYNAPI_PROC(void*,SDL_AndroidGetActivity,(void),(),return)
SDL_DYNAPI_PROC(const char*,SDL_AndroidGetInternalStoragePath,(void),(),return)
@@ -602,11 +601,11 @@ SDL_DYNAPI_PROC(void,SDL_GL_ResetAttributes,(void),(),)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX,(void),(),return)
SDL_DYNAPI_PROC(SDL_AssertionHandler,SDL_GetDefaultAssertionHandler,(void),(),return)
SDL_DYNAPI_PROC(SDL_AssertionHandler,SDL_GetAssertionHandler,(void **a),(a),return)
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL_DYNAPI_PROC(SDL_bool,SDL_DXGIGetOutputInfo,(int a,int *b, int *c),(a,b,c),return)
#endif
SDL_DYNAPI_PROC(SDL_bool,SDL_RenderIsClipEnabled,(SDL_Renderer *a),(a),return)
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
SDL_DYNAPI_PROC(int,SDL_WinRTRunApp,(SDL_main_func a, void *b),(a,b),return)
SDL_DYNAPI_PROC(const wchar_t*,SDL_WinRTGetFSPathUNICODE,(SDL_WinRT_Path a),(a),return)
SDL_DYNAPI_PROC(const char*,SDL_WinRTGetFSPathUTF8,(SDL_WinRT_Path a),(a),return)
@@ -623,7 +622,7 @@ SDL_DYNAPI_PROC(int,SDL_QueueAudio,(SDL_AudioDeviceID a, const void *b, Uint32 c
SDL_DYNAPI_PROC(Uint32,SDL_GetQueuedAudioSize,(SDL_AudioDeviceID a),(a),return)
SDL_DYNAPI_PROC(void,SDL_ClearQueuedAudio,(SDL_AudioDeviceID a),(a),)
SDL_DYNAPI_PROC(SDL_Window*,SDL_GetGrabbedWindow,(void),(),return)
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(void,SDL_SetWindowsMessageHook,(SDL_WindowsMessageHook a, void *b),(a,b),)
#endif
SDL_DYNAPI_PROC(int,SDL_GetDisplayDPI,(int a, float *b, float *c, float *d),(a,b,c,d),return)
@@ -702,20 +701,20 @@ SDL_DYNAPI_PROC(SDL_YUV_CONVERSION_MODE,SDL_GetYUVConversionMode,(void),(),retur
SDL_DYNAPI_PROC(SDL_YUV_CONVERSION_MODE,SDL_GetYUVConversionModeForResolution,(int a, int b),(a,b),return)
SDL_DYNAPI_PROC(void*,SDL_RenderGetMetalLayer,(SDL_Renderer *a),(a),return)
SDL_DYNAPI_PROC(void*,SDL_RenderGetMetalCommandEncoder,(SDL_Renderer *a),(a),return)
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
SDL_DYNAPI_PROC(SDL_WinRT_DeviceFamily,SDL_WinRTGetDeviceFamily,(void),(),return)
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(SDL_bool,SDL_IsAndroidTV,(void),(),return)
#endif
SDL_DYNAPI_PROC(double,SDL_log10,(double a),(a),return)
SDL_DYNAPI_PROC(float,SDL_log10f,(float a),(a),return)
SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForDeviceIndex,(int a),(a),return)
-#ifdef __LINUX__
+#ifdef SDL_PLATFORM_LINUX
SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriority,(Sint64 a, int b),(a,b),return)
#endif
SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX512F,(void),(),return)
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(SDL_bool,SDL_IsChromebook,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_IsDeXMode,(void),(),return)
SDL_DYNAPI_PROC(void,SDL_AndroidBackButton,(void),(),)
@@ -746,10 +745,9 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_HasColorKey,(SDL_Surface *a),(a),return)
#ifdef SDL_CreateThreadWithStackSize
#undef SDL_CreateThreadWithStackSize
#endif
-
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d, pfnSDL_CurrentBeginThread e, pfnSDL_CurrentEndThread f),(a,b,c,d,e,f),return)
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d, pfnSDL_CurrentBeginThread e, pfnSDL_CurrentEndThread f),(a,b,c,d,e,f),return)
#else
SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d),(a,b,c,d),return)
@@ -770,7 +768,7 @@ SDL_DYNAPI_PROC(int,SDL_RenderFillRectsF,(SDL_Renderer *a, const SDL_FRect *b, i
SDL_DYNAPI_PROC(int,SDL_RenderCopyF,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_FRect *d),(a,b,c,d),return)
SDL_DYNAPI_PROC(int,SDL_RenderCopyExF,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_FRect *d, const double e, const SDL_FPoint *f, const SDL_FlipMode g),(a,b,c,d,e,f,g),return)
SDL_DYNAPI_PROC(SDL_TouchDeviceType,SDL_GetTouchDeviceType,(SDL_TouchID a),(a),return)
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL_DYNAPI_PROC(int,SDL_UIKitRunApp,(int a, char *b[], SDL_main_func c),(a,b,c),return)
#endif
SDL_DYNAPI_PROC(size_t,SDL_SIMDGetAlignment,(void),(),return)
@@ -804,10 +802,10 @@ SDL_DYNAPI_PROC(void,SDL_OnApplicationWillResignActive,(void),(),)
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidEnterBackground,(void),(),)
SDL_DYNAPI_PROC(void,SDL_OnApplicationWillEnterForeground,(void),(),)
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidBecomeActive,(void),(),)
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidChangeStatusBarOrientation,(void),(),)
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(int,SDL_GetAndroidSDKVersion,(void),(),return)
#endif
SDL_DYNAPI_PROC(int,SDL_isupper,(int a),(a),return)
@@ -827,7 +825,7 @@ SDL_DYNAPI_PROC(double,SDL_trunc,(double a),(a),return)
SDL_DYNAPI_PROC(float,SDL_truncf,(float a),(a),return)
SDL_DYNAPI_PROC(SDL_Locale *,SDL_GetPreferredLocales,(void),(),return)
SDL_DYNAPI_PROC(void*,SDL_SIMDRealloc,(void *a, const size_t b),(a, b),return)
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(SDL_bool,SDL_AndroidRequestPermission,(const char *a),(a),return)
#endif
SDL_DYNAPI_PROC(int,SDL_OpenURL,(const char *a),(a),return)
@@ -857,7 +855,7 @@ SDL_DYNAPI_PROC(float,SDL_roundf,(float a),(a),return)
SDL_DYNAPI_PROC(long,SDL_lround,(double a),(a),return)
SDL_DYNAPI_PROC(long,SDL_lroundf,(float a),(a),return)
SDL_DYNAPI_PROC(int,SDL_SoftStretchLinear,(SDL_Surface *a, const SDL_Rect *b, SDL_Surface *c, const SDL_Rect *d),(a,b,c,d),return)
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL_DYNAPI_PROC(ID3D11Device*,SDL_RenderGetD3D11Device,(SDL_Renderer *a),(a),return)
#endif
SDL_DYNAPI_PROC(int,SDL_UpdateNVTexture,(SDL_Texture *a, const SDL_Rect *b, const Uint8 *c, int d, const Uint8 *e, int f),(a,b,c,d,e,f),return)
@@ -873,7 +871,7 @@ SDL_DYNAPI_PROC(int,SDL_isxdigit,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_ispunct,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_isprint,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_isgraph,(int a),(a),return)
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(int,SDL_AndroidShowToast,(const char *a, int b, int c, int d, int e),(a,b,c,d,e),return)
#endif
SDL_DYNAPI_PROC(int,SDL_GetAudioDeviceSpec,(int a, int b, SDL2_AudioSpec *c),(a,b,c),return)
@@ -894,7 +892,7 @@ SDL_DYNAPI_PROC(int,SDL_asprintf,(char **a, SDL_PRINTF_FORMAT_STRING const char
SDL_DYNAPI_PROC(int,SDL_vasprintf,(char **a, const char *b, va_list c),(a,b,c),return)
SDL_DYNAPI_PROC(void*,SDL_GetWindowICCProfile,(SDL_Window *a, size_t *b),(a,b),return)
SDL_DYNAPI_PROC(Uint64,SDL_GetTicks64,(void),(),return)
-#ifdef __LINUX__
+#ifdef SDL_PLATFORM_LINUX
SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriorityAndPolicy,(Sint64 a, int b, int c),(a,b,c),return)
#endif
SDL_DYNAPI_PROC(const char*,SDL_GameControllerGetAppleSFSymbolsNameForButton,(SDL_GameController *a, SDL_GameControllerButton b),(a,b),return)
@@ -927,7 +925,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_GameControllerHasRumble,(SDL_GameController *a),(a)
SDL_DYNAPI_PROC(SDL_bool,SDL_GameControllerHasRumbleTriggers,(SDL_GameController *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_hid_ble_scan,(SDL_bool a),(a),)
SDL_DYNAPI_PROC(int,SDL_PremultiplyAlpha,(int a, int b, Uint32 c, const void *d, int e, Uint32 f, void *g, int h),(a,b,c,d,e,f,g,h),return)
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL_DYNAPI_PROC(int,SDL_AndroidSendMessage,(Uint32 a, int b),(a,b),return)
#endif
SDL_DYNAPI_PROC(const char*,SDL_GetTouchName,(int a),(a),return)
@@ -951,12 +949,12 @@ SDL_DYNAPI_PROC(void,SDL_GUIDToString,(SDL_GUID a, char *b, int c),(a,b,c),)
SDL_DYNAPI_PROC(SDL_GUID,SDL_GUIDFromString,(const char *a),(a),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasLSX,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasLASX,(void),(),return)
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(ID3D12Device*,SDL_RenderGetD3D12Device,(SDL_Renderer *a),(a),return)
#endif
SDL_DYNAPI_PROC(size_t,SDL_utf8strnlen,(const char *a, size_t b),(a,b),return)
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(int,SDL_GDKGetTaskQueue,(XTaskQueueHandle *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GDKRunApp,(SDL_main_func a, void *b),(a,b),return)
#endif
@@ -976,12 +974,12 @@ SDL_DYNAPI_PROC(int,SDL_GameControllerGetSensorDataWithTimestamp,(SDL_GameContro
SDL_DYNAPI_PROC(int,SDL_SensorGetDataWithTimestamp,(SDL_Sensor *a, Uint64 *b, float *c, int d),(a,b,c,d),return)
SDL_DYNAPI_PROC(void,SDL_ResetHints,(void),(),)
SDL_DYNAPI_PROC(char*,SDL_strcasestr,(const char *a, const char *b),(a,b),return)
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(void,SDL_GDKSuspendComplete,(void),(),)
#endif
SDL_DYNAPI_PROC(SDL_bool,SDL_HasWindowSurface,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_DestroyWindowSurface,(SDL_Window *a),(a),return)
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL_DYNAPI_PROC(int,SDL_GDKGetDefaultUser,(XUserHandle *a),(a),return)
#endif
SDL_DYNAPI_PROC(Uint64,SDL_GameControllerGetSteamHandle,(SDL_GameController *a),(a),return)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index 3c563f8..ed5bd6c 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -355,7 +355,7 @@ static void OS_GetExeName(char *buf, const unsigned maxpath) {
buf[0] = '\0';
GetModuleFileNameA(NULL, buf, maxpath);
}
-#elif defined(__APPLE__) || defined(__FREEBSD__)
+#elif defined(__APPLE__) || defined(SDL_PLATFORM_FREEBSD)
static void OS_GetExeName(char *buf, const unsigned maxpath) {
const char *progname = getprogname();
if (progname != NULL) {
@@ -5487,7 +5487,7 @@ SDL_GetDisplayDPI(int displayIndex, float *ddpi, float *hdpi, float *vdpi)
content_scale = 1.0f;
}
-#if defined(__ANDROID__) || defined(__IOS__)
+#if defined(SDL_PLATFORM_ANDROID) || defined(SDL_PLATFORM_IOS)
dpi = pixel_density * content_scale * 160.0f;
#else
dpi = pixel_density * content_scale * 96.0f;
@@ -7767,7 +7767,7 @@ SDL_GetThreadID(SDL_Thread *thread)
return (unsigned long)SDL3_GetThreadID(thread);
}
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
DECLSPEC int SDLCALL
SDL_Direct3D9GetAdapterIndex(int displayIndex)
{
@@ -7799,7 +7799,7 @@ DECLSPEC ID3D12Device* SDLCALL SDL_RenderGetD3D12Device(SDL_Renderer *renderer)
}
#endif
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
DECLSPEC int SDLCALL
SDL_WinRTRunApp(SDL_main_func mainFunction, void *reserved)
{
@@ -7807,7 +7807,7 @@ SDL_WinRTRunApp(SDL_main_func mainFunction, void *reserved)
}
#endif
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
DECLSPEC int SDLCALL
SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
{
@@ -7815,14 +7815,15 @@ SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
}
#endif
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
DECLSPEC int SDLCALL
SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction)
{
return SDL3_RunApp(argc, argv, mainFunction, NULL);
}
#endif
-#if defined(__ANDROID__)
+
+#ifdef SDL_PLATFORM_ANDROID
DECLSPEC int SDLCALL
SDL_AndroidGetExternalStorageState(void)
{
diff --git a/src/sdl2_compat.h b/src/sdl2_compat.h
index 21596d0..ffd96c1 100644
--- a/src/sdl2_compat.h
+++ b/src/sdl2_compat.h
@@ -176,7 +176,7 @@ typedef struct SDL2_AudioStream
#define SDL2_AUDIO_ALLOW_ANY_CHANGE (SDL2_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL2_AUDIO_ALLOW_FORMAT_CHANGE|SDL2_AUDIO_ALLOW_CHANNELS_CHANGE|SDL2_AUDIO_ALLOW_SAMPLES_CHANGE)
/* Prototypes for D3D devices */
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
typedef struct IDirect3DDevice9 IDirect3DDevice9;
typedef struct ID3D11Device ID3D11Device;
typedef struct ID3D12Device ID3D12Device;
diff --git a/src/sdl2_protos.h b/src/sdl2_protos.h
index ce718ad..01f62d3 100644
--- a/src/sdl2_protos.h
+++ b/src/sdl2_protos.h
@@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#ifndef sdl2_protos_h
-#define sdl2_protos_h 1
+#ifndef sdl2_protos_h_
+#define sdl2_protos_h_ 1
#define SDL2_PROTO(rc,fn,params) \
extern DECLSPEC rc SDLCALL SDL_##fn params ;
@@ -37,9 +37,9 @@ SDL2_PROTO(void,LogMessage,(int a, SDL_LogPriority b, SDL_PRINTF_FORMAT_STRING c
SDL2_PROTO(int,sscanf,(const char *a, SDL_SCANF_FORMAT_STRING const char *b, ...))
SDL2_PROTO(int,snprintf,(SDL_OUT_Z_CAP(b) char *a, size_t b, SDL_PRINTF_FORMAT_STRING const char *c, ...))
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL2_PROTO(SDL_Thread*,CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e))
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
SDL2_PROTO(SDL_Thread*,CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e))
#else
SDL2_PROTO(SDL_Thread*,CreateThread,(SDL_ThreadFunction a, const char *b, void *c))
@@ -51,22 +51,22 @@ SDL2_PROTO(SDL2_RWops*,RWFromFP,(FILE *a, SDL_bool b))
SDL2_PROTO(SDL2_RWops*,RWFromFP,(void *a, SDL_bool b))
#endif
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL2_PROTO(int,RegisterApp,(const char *a, Uint32 b, void *c))
SDL2_PROTO(void,UnregisterApp,(void))
#endif
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL2_PROTO(int,Direct3D9GetAdapterIndex,(int a))
SDL2_PROTO(IDirect3DDevice9*,RenderGetD3D9Device,(SDL_Renderer *a))
#endif
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL2_PROTO(int,iPhoneSetAnimationCallback,(SDL_Window *a, int b, void (SDLCALL *c)(void *))
SDL2_PROTO(void,iPhoneSetEventPump,(SDL_bool a))
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(void*,AndroidGetJNIEnv,(void))
SDL2_PROTO(void*,AndroidGetActivity,(void))
SDL2_PROTO(const char*,AndroidGetInternalStoragePath,(void))
@@ -591,11 +591,11 @@ SDL2_PROTO(void,GL_ResetAttributes,(void))
SDL2_PROTO(SDL_bool,HasAVX,(void))
SDL2_PROTO(SDL_AssertionHandler,GetDefaultAssertionHandler,(void))
SDL2_PROTO(SDL_AssertionHandler,GetAssertionHandler,(void **a))
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL2_PROTO(SDL_bool,DXGIGetOutputInfo,(int a,int *b, int *c))
#endif
SDL2_PROTO(SDL_bool,RenderIsClipEnabled,(SDL_Renderer *a))
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
SDL2_PROTO(int,WinRTRunApp,(SDL_main_func a, void *b))
SDL2_PROTO(const wchar_t*,WinRTGetFSPathUNICODE,(SDL_WinRT_Path a))
SDL2_PROTO(const char*,WinRTGetFSPathUTF8,(SDL_WinRT_Path a))
@@ -612,7 +612,7 @@ SDL2_PROTO(int,QueueAudio,(SDL_AudioDeviceID a, const void *b, Uint32 c))
SDL2_PROTO(Uint32,GetQueuedAudioSize,(SDL_AudioDeviceID a))
SDL2_PROTO(void,ClearQueuedAudio,(SDL_AudioDeviceID a))
SDL2_PROTO(SDL_Window*,GetGrabbedWindow,(void))
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL2_PROTO(void,SetWindowsMessageHook,(SDL_WindowsMessageHook a, void *b))
#endif
SDL2_PROTO(int,GetDisplayDPI,(int a, float *b, float *c, float *d))
@@ -691,20 +691,20 @@ SDL2_PROTO(SDL_YUV_CONVERSION_MODE,GetYUVConversionMode,(void))
SDL2_PROTO(SDL_YUV_CONVERSION_MODE,GetYUVConversionModeForResolution,(int a, int b))
SDL2_PROTO(void*,RenderGetMetalLayer,(SDL_Renderer *a))
SDL2_PROTO(void*,RenderGetMetalCommandEncoder,(SDL_Renderer *a))
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
SDL2_PROTO(SDL_WinRT_DeviceFamily,WinRTGetDeviceFamily,(void))
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(SDL_bool,IsAndroidTV,(void))
#endif
SDL2_PROTO(double,log10,(double a))
SDL2_PROTO(float,log10f,(float a))
SDL2_PROTO(char*,GameControllerMappingForDeviceIndex,(int a))
-#ifdef __LINUX__
+#ifdef SDL_PLATFORM_LINUX
SDL2_PROTO(int,LinuxSetThreadPriority,(Sint64 a, int b))
#endif
SDL2_PROTO(SDL_bool,HasAVX512F,(void))
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(SDL_bool,IsChromebook,(void))
SDL2_PROTO(SDL_bool,IsDeXMode,(void))
SDL2_PROTO(void,AndroidBackButton,(void))
@@ -732,9 +732,9 @@ SDL2_PROTO(SDL_bool,IsTablet,(void))
SDL2_PROTO(SDL_DisplayOrientation,GetDisplayOrientation,(int a))
SDL2_PROTO(SDL_bool,HasColorKey,(SDL_Surface *a))
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL2_PROTO(SDL_Thread*,CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d, pfnSDL_CurrentBeginThread e, pfnSDL_CurrentEndThread f))
-#elif defined(__OS2__)
+#elif defined(SDL_PLATFORM_OS2)
SDL2_PROTO(SDL_Thread*,CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d, pfnSDL_CurrentBeginThread e, pfnSDL_CurrentEndThread f))
#else
SDL2_PROTO(SDL_Thread*,CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d))
@@ -755,7 +755,7 @@ SDL2_PROTO(int,RenderFillRectsF,(SDL_Renderer *a, const SDL_FRect *b, int c))
SDL2_PROTO(int,RenderCopyF,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_FRect *d))
SDL2_PROTO(int,RenderCopyExF,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_FRect *d, const double e, const SDL_FPoint *f, const SDL_FlipMode g))
SDL2_PROTO(SDL_TouchDeviceType,GetTouchDeviceType,(SDL_TouchID a))
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL2_PROTO(int,UIKitRunApp,(int a, char *b[], SDL_main_func c))
#endif
SDL2_PROTO(size_t,SIMDGetAlignment,(void))
@@ -789,10 +789,10 @@ SDL2_PROTO(void,OnApplicationWillResignActive,(void))
SDL2_PROTO(void,OnApplicationDidEnterBackground,(void))
SDL2_PROTO(void,OnApplicationWillEnterForeground,(void))
SDL2_PROTO(void,OnApplicationDidBecomeActive,(void))
-#ifdef __IOS__
+#ifdef SDL_PLATFORM_IOS
SDL2_PROTO(void,OnApplicationDidChangeStatusBarOrientation,(void))
#endif
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(int,GetAndroidSDKVersion,(void))
#endif
SDL2_PROTO(int,isupper,(int a))
@@ -812,7 +812,7 @@ SDL2_PROTO(double,trunc,(double a))
SDL2_PROTO(float,truncf,(float a))
SDL2_PROTO(SDL_Locale *,GetPreferredLocales,(void))
SDL2_PROTO(void*,SIMDRealloc,(void *a, const size_t b))
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(SDL_bool,AndroidRequestPermission,(const char *a))
#endif
SDL2_PROTO(int,OpenURL,(const char *a))
@@ -842,7 +842,7 @@ SDL2_PROTO(float,roundf,(float a))
SDL2_PROTO(long,lround,(double a))
SDL2_PROTO(long,lroundf,(float a))
SDL2_PROTO(int,SoftStretchLinear,(SDL_Surface *a, const SDL_Rect *b, SDL_Surface *c, const SDL_Rect *d))
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL2_PROTO(ID3D11Device*,RenderGetD3D11Device,(SDL_Renderer *a))
#endif
SDL2_PROTO(int,UpdateNVTexture,(SDL_Texture *a, const SDL_Rect *b, const Uint8 *c, int d, const Uint8 *e, int f))
@@ -858,7 +858,7 @@ SDL2_PROTO(int,isxdigit,(int a))
SDL2_PROTO(int,ispunct,(int a))
SDL2_PROTO(int,isprint,(int a))
SDL2_PROTO(int,isgraph,(int a))
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(int,AndroidShowToast,(const char *a, int b, int c, int d, int e))
#endif
SDL2_PROTO(int,GetAudioDeviceSpec,(int a, int b, SDL2_AudioSpec *c))
@@ -877,7 +877,7 @@ SDL2_PROTO(int,asprintf,(char **a, SDL_PRINTF_FORMAT_STRING const char *b, ...))
SDL2_PROTO(int,vasprintf,(char **a, const char *b, va_list c))
SDL2_PROTO(void*,GetWindowICCProfile,(SDL_Window *a, size_t *b))
SDL2_PROTO(Uint64,GetTicks64,(void))
-#ifdef __LINUX__
+#ifdef SDL_PLATFORM_LINUX
SDL2_PROTO(int,LinuxSetThreadPriorityAndPolicy,(Sint64 a, int b, int c))
#endif
SDL2_PROTO(const char*,GameControllerGetAppleSFSymbolsNameForButton,(SDL_GameController *a, SDL_GameControllerButton b))
@@ -910,7 +910,7 @@ SDL2_PROTO(SDL_bool,GameControllerHasRumble,(SDL_GameController *a))
SDL2_PROTO(SDL_bool,GameControllerHasRumbleTriggers,(SDL_GameController *a))
SDL2_PROTO(void,hid_ble_scan,(SDL_bool a))
SDL2_PROTO(int,PremultiplyAlpha,(int a, int b, Uint32 c, const void *d, int e, Uint32 f, void *g, int h))
-#ifdef __ANDROID__
+#ifdef SDL_PLATFORM_ANDROID
SDL2_PROTO(int,AndroidSendMessage,(Uint32 a, int b))
#endif
SDL2_PROTO(const char*,GetTouchName,(int a))
@@ -934,11 +934,11 @@ SDL2_PROTO(void,GUIDToString,(SDL_GUID a, char *b, int c))
SDL2_PROTO(SDL_GUID,GUIDFromString,(const char *a))
SDL2_PROTO(SDL_bool,HasLSX,(void))
SDL2_PROTO(SDL_bool,HasLASX,(void))
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL2_PROTO(ID3D12Device*,RenderGetD3D12Device,(SDL_Renderer *a))
#endif
SDL2_PROTO(size_t,utf8strnlen,(const char *a, size_t b))
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL2_PROTO(int,GDKGetTaskQueue,(XTaskQueueHandle *a))
SDL2_PROTO(int,GDKRunApp,(SDL_main_func a, void *b))
#endif
@@ -958,16 +958,16 @@ SDL2_PROTO(int,GameControllerGetSensorDataWithTimestamp,(SDL_GameController *a,
SDL2_PROTO(int,SensorGetDataWithTimestamp,(SDL_Sensor *a, Uint64 *b, float *c, int d))
SDL2_PROTO(void,ResetHints,(void))
SDL2_PROTO(char*,strcasestr,(const char *a, const char *b))
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL2_PROTO(void,GDKSuspendComplete,(void))
#endif
SDL2_PROTO(SDL_bool,HasWindowSurface,(SDL_Window *a))
SDL2_PROTO(int,DestroyWindowSurface,(SDL_Window *a))
-#if defined(__GDK__)
+#if defined(SDL_PLATFORM_GDK)
SDL2_PROTO(int,GDKGetDefaultUser,(XUserHandle *a))
#endif
SDL2_PROTO(Uint64,GameControllerGetSteamHandle,(SDL_GameController *a))
#undef SDL2_PROTO
-#endif /* sdl2_protos_h */
+#endif /* sdl2_protos_h_ */
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 2dde4e4..a93a459 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -49,7 +49,7 @@ SDL3_SYM_VARARGS(void,LogMessage,(int a, SDL_LogPriority b, SDL_PRINTF_FORMAT_ST
SDL3_SYM_VARARGS(int,sscanf,(const char *a, SDL_SCANF_FORMAT_STRING const char *b, ...))
SDL3_SYM_VARARGS(int,snprintf,(SDL_OUT_Z_CAP(b) char *a, size_t b, SDL_PRINTF_FORMAT_STRING const char *c, ...))
-#if (defined(__WIN32__) || defined(__GDK__)) && !defined(__WINRT__)
+#if (defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)) && !defined(SDL_PLATFORM_WINRT)
SDL3_SYM_PASSTHROUGH(SDL_Thread*,CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e),(a,b,c,d,e),return)
SDL3_SYM_PASSTHROUGH(SDL_Thread*,CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d, pfnSDL_CurrentBeginThread e, pfnSDL_CurrentEndThread f),(a,b,c,d,e,f),return)
#else
@@ -57,40 +57,40 @@ SDL3_SYM_PASSTHROUGH(SDL_Thread*,CreateThread,(SDL_ThreadFunction a, const char
SDL3_SYM_PASSTHROUGH(SDL_Thread*,CreateThreadWithStackSize,(SDL_ThreadFunction a, const char *b, const size_t c, void *d),(a,b,c,d),return)
#endif
-#if defined(__WIN32__) || defined(__GDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
SDL3_SYM_PASSTHROUGH(int,RegisterApp,(const char *a, Uint32 b, void *c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(void,UnregisterApp,(void),(),)
SDL3_SYM_PASSTHROUGH(void,SetWindowsMessageHook,(SDL_WindowsMessageHook a, void *b),(a,b),)
#endif
-#if defined(__WIN32__) || defined(__WINGDK__)
+#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
SDL3_SYM(int,Direct3D9GetAdapterIndex,(SDL_DisplayID a),(a),return)
SDL3_SYM(SDL_bool,DXGIGetOutputInfo,(SDL_DisplayID a,int *b, int *c),(a,b,c),return)
#endif
-#ifdef __GDK__
+#ifdef SDL_PLATFORM_GDK
SDL3_SYM_PASSTHROUGH(int,GDKGetTaskQueue,(XTaskQueueHandle *a),(a),return)
SDL3_SYM_PASSTHROUGH(int,GDKGetDefaultUser,(XUserHandle *a),(a),return)
#endif
-#ifdef __WINRT__
+#ifdef SDL_PLATFORM_WINRT
SDL3_SYM_PASSTHROUGH(const wchar_t*,WinRTGetFSPathUNICODE,(SDL_WinRT_Path a),(a),return
(Patch may be truncated, please check the link at the top of this post.)