From 30a09c9ffc086dfd07fa5857decd5bcb4c523758 Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Wed, 26 Sep 2012 15:57:28 -0300 Subject: [PATCH] Make SDL_atomic.h depend on the void pointer size determined at compile time rather than at configure time. As OS X supports lipo'ed versions of SDL for i386 and x86_64, a single set of headers that work for both architectures is desired. --- include/SDL_atomic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h index 16793bee6..4b737f548 100644 --- a/include/SDL_atomic.h +++ b/include/SDL_atomic.h @@ -161,10 +161,10 @@ void _ReadWriteBarrier(void); #include #define SDL_AtomicCAS(a, oldval, newval) OSAtomicCompareAndSwap32Barrier((oldval), (newval), &(a)->value) -#if SIZEOF_VOIDP == 4 -#define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap32Barrier((int32_t)(oldval), (int32_t)(newval), (int32_t*)(a)) -#elif SIZEOF_VOIDP == 8 +#ifdef __LP64__ #define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap64Barrier((int64_t)(oldval), (int64_t)(newval), (int64_t*)(a)) +#else +#define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap32Barrier((int32_t)(oldval), (int32_t)(newval), (int32_t*)(a)) #endif #elif defined(HAVE_GCC_ATOMICS)