From ba09f99f5a632d51241e072f6a7fa62046198653 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 6 Jun 2011 12:20:04 -0400 Subject: [PATCH] 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 | 4 ++-- include/SDL_atomic.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/SDL_assert.h b/include/SDL_assert.h index d55e24414..a11b3812a 100644 --- a/include/SDL_assert.h +++ b/include/SDL_assert.h @@ -53,7 +53,7 @@ assert can have unique static variables associated with it. /* 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 @@ -63,7 +63,7 @@ extern void __cdecl __debugbreak(void); #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__ diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h index 5c6eadb5b..6a6a73f5b 100644 --- a/include/SDL_atomic.h +++ b/include/SDL_atomic.h @@ -140,7 +140,7 @@ void _ReadWriteBarrier(void); /* 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