Fixed gcc warnings for apps using SDL headers with -Wundef flag.
authorRyan C. Gordon <icculus@icculus.org>
Mon, 06 Jun 2011 12:20:04 -0400
changeset 5552 2167a41feefe
parent 5548 8f0abb6ef37d
child 5553 418675ebba17
Fixed gcc warnings for apps using SDL headers with -Wundef flag. Fixes Bugzilla #1216. Thanks to Dimitris Zenios for the patch!
include/SDL_assert.h
include/SDL_atomic.h
--- a/include/SDL_assert.h	Sat Jun 04 15:26:02 2011 -0400
+++ b/include/SDL_assert.h	Mon Jun 06 12:20:04 2011 -0400
@@ -53,7 +53,7 @@
 /* Don't include intrin.h here because it contains C++ code */
 extern void __cdecl __debugbreak(void);
     #define SDL_TriggerBreakpoint() __debugbreak()
-#elif (defined(__GNUC__) && ((__i386__) || (__x86_64__)))
+#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
 #elif defined(HAVE_SIGNAL_H)
     #include <signal.h>
@@ -63,7 +63,7 @@
     #define SDL_TriggerBreakpoint()
 #endif
 
-#if (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
 #   define SDL_FUNCTION __func__
 #elif ((__GNUC__ >= 2) || defined(_MSC_VER))
 #   define SDL_FUNCTION __FUNCTION__
--- a/include/SDL_atomic.h	Sat Jun 04 15:26:02 2011 -0400
+++ b/include/SDL_atomic.h	Mon Jun 06 12:20:04 2011 -0400
@@ -140,7 +140,7 @@
 /* Platform specific optimized versions of the atomic functions,
  * you can disable these by defining SDL_DISABLE_ATOMIC_INLINE
  */
-#if SDL_ATOMIC_DISABLED
+#if defined(SDL_ATOMIC_DISABLED) && SDL_ATOMIC_DISABLED
 #define SDL_DISABLE_ATOMIC_INLINE
 #endif
 #ifndef SDL_DISABLE_ATOMIC_INLINE