1
0
Эх сурвалжийг харах

Fix the "redundant redeclaration" warning for `__debugbreak` when using MinGW (#14264)

(cherry picked from commit b0a9aa3db04128c9e66f8d958e08ea23ed88a951)
Roman Fomin 21 цаг өмнө
parent
commit
7879d0b7b3

+ 4 - 1
include/SDL3/SDL_assert.h

@@ -126,10 +126,13 @@ extern "C" {
  */
  */
 #define SDL_TriggerBreakpoint() TriggerABreakpointInAPlatformSpecificManner
 #define SDL_TriggerBreakpoint() TriggerABreakpointInAPlatformSpecificManner
 
 
-#elif defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1310)
+#elif defined(_MSC_VER) && _MSC_VER >= 1310
     /* Don't include intrin.h here because it contains C++ code */
     /* Don't include intrin.h here because it contains C++ code */
     extern void __cdecl __debugbreak(void);
     extern void __cdecl __debugbreak(void);
     #define SDL_TriggerBreakpoint() __debugbreak()
     #define SDL_TriggerBreakpoint() __debugbreak()
+#elif defined(__MINGW32__)
+    #include <intrin.h>
+    #define SDL_TriggerBreakpoint() __debugbreak()
 #elif defined(_MSC_VER) && defined(_M_IX86)
 #elif defined(_MSC_VER) && defined(_M_IX86)
     #define SDL_TriggerBreakpoint() { _asm { int 0x03 }  }
     #define SDL_TriggerBreakpoint() { _asm { int 0x03 }  }
 #elif SDL_HAS_BUILTIN(__builtin_debugtrap)
 #elif SDL_HAS_BUILTIN(__builtin_debugtrap)