sdl (master post 3.1 preview) Merge commit 'e4f454091a943345938608570b104400f62fd625'

external/sdl/SDL/include/SDL3/SDL_platform_defines.h

@@ -29,48 +29,40 @@
 #define SDL_platform_defines_h_
 
 #ifdef _AIX
-#undef __AIX__
-#define __AIX__     1
+#define SDL_PLATFORM_AIX    1
 #endif
 #ifdef __HAIKU__
-#undef __HAIKU__
-#define __HAIKU__   1
+#define SDL_PLATFORM_HAIKU   1
 #endif
 #if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__    1
-#endif
-#ifdef _arch_dreamcast
-#undef __DREAMCAST__
-#define __DREAMCAST__   1
+#define SDL_PLATFORM_BSDI    1
 #endif
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__ 1
+#define SDL_PLATFORM_FREEBSD 1
 #endif
 #if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__    1
+#define SDL_PLATFORM_HPUX    1
 #endif
 #if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__    1
+#define SDL_PLATFORM_IRIX    1
 #endif
 #if (defined(linux) || defined(__linux) || defined(__linux__))
-#undef __LINUX__
-#define __LINUX__   1
+#define SDL_PLATFORM_LINUX   1
 #endif
 #if defined(ANDROID) || defined(__ANDROID__)
-#undef __ANDROID__
-#undef __LINUX__ /* do we need to do this? */
-#define __ANDROID__ 1
+#undef SDL_PLATFORM_LINUX /* do we need to do this? */
+#define SDL_PLATFORM_ANDROID    1
 #endif
 #ifdef __NGAGE__
-#undef __NGAGE__
-#define __NGAGE__ 1
+#define SDL_PLATFORM_NGAGE 1
+#endif
+
+#if defined(__unix__) || defined(__unix) || defined(unix)
+#define SDL_PLATFORM_UNIX   1
 #endif
 
 #ifdef __APPLE__
+#define SDL_PLATFORM_APPLE  1
 /* lets us know what version of macOS we're compiling on */
 #include <AvailabilityMacros.h>
 #include <TargetConditionals.h>
@@ -94,56 +86,58 @@
 #ifndef TARGET_OS_SIMULATOR
 #define TARGET_OS_SIMULATOR 0
 #endif
-#ifndef TARGET_OS_XR
-#define TARGET_OS_XR 0
+#ifndef TARGET_OS_VISION
+#define TARGET_OS_VISION 0
 #endif
 
 #if TARGET_OS_TV
-#undef __TVOS__
-#define __TVOS__ 1
+#define SDL_PLATFORM_TVOS   1
+#endif
+#if TARGET_OS_VISION
+#define SDL_PLATFORM_VISIONOS 1
 #endif
 #if TARGET_OS_IPHONE
-#undef __IOS__
-#define __IOS__ 1
+#define SDL_PLATFORM_IOS    1
 #else
-#undef __MACOS__
-#define __MACOS__  1
+#define SDL_PLATFORM_MACOS  1
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
 # error SDL for macOS only supports deploying on 10.7 and above.
 #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1070 */
 #endif /* TARGET_OS_IPHONE */
-#endif /* defined(__APPLE__) */
+#endif /* defined(SDL_PLATFORM_APPLE) */
 
+#ifdef __EMSCRIPTEN__
+#define SDL_PLATFORM_EMSCRIPTEN 1
+#endif
 #ifdef __NetBSD__
-#undef __NETBSD__
-#define __NETBSD__  1
+#define SDL_PLATFORM_NETBSD 1
 #endif
 #ifdef __OpenBSD__
-#undef __OPENBSD__
-#define __OPENBSD__ 1
+#define SDL_PLATFORM_OPENBSD    1
 #endif
 #if defined(__OS2__) || defined(__EMX__)
-#undef __OS2__
-#define __OS2__     1
+#define SDL_PLATFORM_OS2    1
 #endif
 #if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__     1
+#define SDL_PLATFORM_OSF    1
 #endif
 #ifdef __QNXNTO__
-#undef __QNXNTO__
-#define __QNXNTO__  1
+#define SDL_PLATFORM_QNXNTO 1
 #endif
 #if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__  1
+#define SDL_PLATFORM_RISCOS 1
 #endif
 #if defined(__sun) && defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__ 1
+#define SDL_PLATFORM_SOLARIS    1
 #endif
 
-#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__)
+#define SDL_PLATFORM_CYGWIN 1
+#endif
+
+#if defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN)
+#define SDL_PLATFORM_WINDOWS  1    /* Win32 api and Windows-based OSs */
+
 /* Try to find out if we're compiling for WinRT, GDK or non-WinRT/GDK */
 #if defined(_MSC_VER) && defined(__has_include)
 #if __has_include(<winapifamily.h>)
@@ -173,47 +167,36 @@
 #endif
 
 #if WINAPI_FAMILY_WINRT
-#undef __WINRT__
-#define __WINRT__ 1
+#define SDL_PLATFORM_WINRT   1
 #elif defined(_GAMING_DESKTOP) /* GDK project configuration always defines _GAMING_XXX */
-#undef __WINGDK__
-#define __WINGDK__ 1
+#define SDL_PLATFORM_WINGDK 1
 #elif defined(_GAMING_XBOX_XBOXONE)
-#undef __XBOXONE__
-#define __XBOXONE__ 1
+#define SDL_PLATFORM_XBOXONE    1
 #elif defined(_GAMING_XBOX_SCARLETT)
-#undef __XBOXSERIES__
-#define __XBOXSERIES__ 1
+#define SDL_PLATFORM_XBOXSERIES 1
 #else
-#undef __WINDOWS__
-#define __WINDOWS__ 1
+#define SDL_PLATFORM_WIN32      1
 #endif
-#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
+#endif /* defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN) */
 
-#ifdef __WINDOWS__
-#undef __WIN32__
-#define __WIN32__ 1
-#endif
 /* This is to support generic "any GDK" separate from a platform-specific GDK */
-#if defined(__WINGDK__) || defined(__XBOXONE__) || defined(__XBOXSERIES__)
-#undef __GDK__
-#define __GDK__ 1
+#if defined(SDL_PLATFORM_WINGDK) || defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
+#define SDL_PLATFORM_GDK    1
 #endif
-#ifdef __PSP__
-#undef __PSP__
-#define __PSP__ 1
+#if defined(__PSP__) || defined(__psp__)
+#define SDL_PLATFORM_PSP    1
 #endif
-#ifdef PS2
-#define __PS2__ 1
+#if defined(__PS2__) || defined(PS2)
+#define SDL_PLATFORM_PS2    1
 #endif
 
-#ifdef __vita__
-#define __VITA__ 1
+#if defined(__vita__) || defined(__psp2__)
+#define SDL_PLATFORM_VITA   1
 #endif
 
 #ifdef __3DS__
 #undef __3DS__
-#define __3DS__ 1
+#define SDL_PLATFORM_3DS    1
 #endif
 
 #endif /* SDL_platform_defines_h_ */