sdl-ios-xcode: include/SDL_atomic.h comparison

comparison include/SDL_atomic.h @ 5099:b938ad843e52

More fixes for compilation on Visual Studio

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 25 Jan 2011 18:02:41 -0800
parents	e4301cde4de1
children	470ede30189c

comparison

equal deleted inserted replaced

-:e4301cde4de1
+:b938ad843e52
 */
 #ifdef _MSC_VER
 void _ReadWriteBarrier(void);
 #pragma intrinsic(_ReadWriteBarrier)
 #define SDL_CompilerBarrier()   _ReadWriteBarrier()
-#elif __GNUC__
+#elif defined(__GNUC__)
 #define SDL_CompilerBarrier()   __asm__ __volatile__ ("" : : : "memory")
 #else
 #define SDL_CompilerBarrier()   \
 ({ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); })
 #endif
 /* Platform specific optimized versions of the atomic functions,
 * you can disable these by defining SDL_DISABLE_ATOMIC_INLINE
 */
 #ifndef SDL_DISABLE_ATOMIC_INLINE
-#if HAVE_MSC_ATOMICS
+#ifdef HAVE_MSC_ATOMICS
 #define SDL_AtomicSet(a, v)     _InterlockedExchange((long*)&(a)->value, (v))
 #define SDL_AtomicAdd(a, v)     _InterlockedExchangeAdd((long*)&(a)->value, (v))
 #define SDL_AtomicCAS(a, oldval, newval) (_InterlockedCompareExchange((long*)&(a)->value, (newval), (oldval)) == (oldval))
 #define SDL_AtomicSetPtr(a, v)  _InterlockedExchangePointer((a), (v))
 #define SDL_AtomicCASPtr(a, oldval, newval) (_InterlockedCompareExchange((long*)(a), (long)(newval), (long)(oldval)) == (long)(oldval))
 #else
 #define SDL_AtomicCASPtr(a, oldval, newval) (_InterlockedCompareExchangePointer((a), (newval), (oldval)) == (oldval))
 #endif
-#elif __MACOSX__
+#elif defined(__MACOSX__)
 #include <libkern/OSAtomic.h>
 #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
 #define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap64Barrier((int64_t)(oldval), (int64_t)(newval), (int64_t*)(a))
 #endif
-#elif HAVE_GCC_ATOMICS
+#elif defined(HAVE_GCC_ATOMICS)
 #define SDL_AtomicSet(a, v)     __sync_lock_test_and_set(&(a)->value, v)
 #define SDL_AtomicAdd(a, v)     __sync_fetch_and_add(&(a)->value, v)
 #define SDL_AtomicSetPtr(a, v)  __sync_lock_test_and_set(a, v)
 #define SDL_AtomicCAS(a, oldval, newval) __sync_bool_compare_and_swap(&(a)->value, oldval, newval)
 #ifndef SDL_atomic_t_defined
 typedef struct { int value; } SDL_atomic_t;
 #endif
 /**
-* \brief Set an atomic variable to a value.
-*
-* \return The previous value of the atomic variable.
-*/
-#ifndef SDL_AtomicSet
-#define SDL_AtomicSet(a, v) \
-({                              \
-int _value;                 \
-do {                        \
-_value = (a)->value;    \
-} while (!SDL_AtomicCAS(a, _value, (v))); \
-_value;                     \
-})
-#endif
-/**
-* \brief Get the value of an atomic variable
-*/
-#ifndef SDL_AtomicGet
-#define SDL_AtomicGet(a)        \
-({                              \
-int _value = (a)->value;    \
-SDL_CompilerBarrier();      \
-_value;                     \
-})
-#endif
-/**
-* \brief Add to an atomic variable.
-*
-* \return The previous value of the atomic variable.
-*
-* \note This same style can be used for any number operation
-*/
-#ifndef SDL_AtomicAdd
-#define SDL_AtomicAdd(a, v)     \
-({                              \
-int _value;                 \
-do {                        \
-_value = (a)->value;    \
-} while (!SDL_AtomicCAS(a, _value, (_value + (v)))); \
-_value;                     \
-})
-#endif
-/**
-* \brief Increment an atomic variable used as a reference count.
-*/
-#ifndef SDL_AtomicIncRef
-#define SDL_AtomicIncRef(a)    SDL_AtomicAdd(a, 1)
-#endif
-/**
-* \brief Decrement an atomic variable used as a reference count.
-*
-* \return SDL_TRUE if the variable reached zero after decrementing,
-*         SDL_FALSE otherwise
-*/
-#ifndef SDL_AtomicDecRef
-#define SDL_AtomicDecRef(a)    (SDL_AtomicAdd(a, -1) == 1)
-#endif
-/**
 * \brief Set an atomic variable to a new value if it is currently an old value.
 *
 * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise.
 *
 * \note If you don't know what this function is for, you shouldn't use it!
 #define SDL_AtomicCAS SDL_AtomicCAS_
 #endif
 extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS_(SDL_atomic_t *a, int oldval, int newval);
 /**
-* \brief Set a pointer to a value atomically.
+* \brief Set an atomic variable to a value.
 *
-* \return The previous value of the pointer.
+* \return The previous value of the atomic variable.
 */
-#ifndef SDL_AtomicSetPtr
+#ifndef SDL_AtomicSet
-#define SDL_AtomicSetPtr(a, v)  \
+static __inline__ int SDL_AtomicSet(SDL_atomic_t *a, int v)
-({                              \
+{
-void* _value;               \
+int value;
-do {                        \
+do {
-_value = *(a);          \
+value = a->value;
-} while (!SDL_AtomicCASPtr(a, _value, (v))); \
+} while (!SDL_AtomicCAS(a, value, v));
-_value;                     \
+return value;
-})
+}
 #endif
 /**
-* \brief Get the value of a pointer atomically.
+* \brief Get the value of an atomic variable
 */
-#ifndef SDL_AtomicGetPtr
+#ifndef SDL_AtomicGet
-#define SDL_AtomicGetPtr(a)     \
+static __inline__ int SDL_AtomicGet(SDL_atomic_t *a)
-({                              \
+{
-void* _value = *(a);        \
+int value = a->value;
-SDL_CompilerBarrier();      \
+SDL_CompilerBarrier();
-_value;                     \
+return value;
-})
+}
+#endif
+/**
+* \brief Add to an atomic variable.
+*
+* \return The previous value of the atomic variable.
+*
+* \note This same style can be used for any number operation
+*/
+#ifndef SDL_AtomicAdd
+static __inline__ int SDL_AtomicAdd(SDL_atomic_t *a, int v)
+{
+int value;
+do {
+value = a->value;
+} while (!SDL_AtomicCAS(a, value, (value + v)));
+return value;
+}
+#endif
+/**
+* \brief Increment an atomic variable used as a reference count.
+*/
+#ifndef SDL_AtomicIncRef
+#define SDL_AtomicIncRef(a)    SDL_AtomicAdd(a, 1)
+#endif
+/**
+* \brief Decrement an atomic variable used as a reference count.
+*
+* \return SDL_TRUE if the variable reached zero after decrementing,
+*         SDL_FALSE otherwise
+*/
+#ifndef SDL_AtomicDecRef
+#define SDL_AtomicDecRef(a)    (SDL_AtomicAdd(a, -1) == 1)
 #endif
 /**
 * \brief Set a pointer to a new value if it is currently an old value.
 *
 #ifndef SDL_AtomicCASPtr
 #define SDL_AtomicCASPtr SDL_AtomicCASPtr_
 #endif
 extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr_(void **a, void *oldval, void *newval);
+/**
+* \brief Set a pointer to a value atomically.
+*
+* \return The previous value of the pointer.
+*/
+#ifndef SDL_AtomicSetPtr
+static __inline__ void* SDL_AtomicSetPtr(void* *a, void* v)
+{
+void* value;
+do {
+value = *a;
+} while (!SDL_AtomicCASPtr(a, value, v));
+return value;
+}
+#endif
+/**
+* \brief Get the value of a pointer atomically.
+*/
+#ifndef SDL_AtomicGetPtr
+static __inline__ void* SDL_AtomicGetPtr(void* *a)
+{
+void* value = *a;
+SDL_CompilerBarrier();
+return value;
+}
+#endif
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
 }
 /* *INDENT-ON* */

Mercurial > sdl-ios-xcode

comparison include/SDL_atomic.h @ 5099:b938ad843e52