@@ -9,47 +9,114 @@
  * the packaging of this file.
  */
 
 #import "OFMacros.h"
 
+#if defined(OF_THREADS) && !defined(OF_HAVE_GCC_ATOMIC_OPS) && \
+    !defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+# error No atomic operations available!
+#endif
+
+#ifdef OF_HAVE_LIBKERN_OSATOMIC_H
+# include <libkern/OSAtomic.h>
+#endif
+
+static OF_INLINE int32_t
+of_atomic_add32(volatile int32_t *p, int32_t i)
+{
+#if !defined(OF_THREADS)
+	return (*p += i);
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_add_and_fetch(p, i);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicAdd32Barrier(i, p);
+#endif
+}
+
+static OF_INLINE int32_t
+of_atomic_sub32(volatile int32_t *p, int32_t i)
+{
+#if !defined(OF_THREADS)
+	return (*p -= i);
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_sub_and_fetch(p, i);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicAdd32Barrier(-i, p);
+#endif
+}
+
+static OF_INLINE int32_t
+of_atomic_inc32(volatile int32_t *p)
+{
+#if !defined(OF_THREADS)
+	return ++*p;
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_add_and_fetch(p, 1);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicIncrement32Barrier(p);
+#endif
+}
+
+static OF_INLINE int32_t
+of_atomic_dec32(volatile int32_t *p)
+{
+#if !defined(OF_THREADS)
+	return --*p;
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_sub_and_fetch(p, 1);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicDecrement32Barrier(p);
+#endif
+}
+
+static OF_INLINE uint32_t
+of_atomic_or32(volatile uint32_t *p, uint32_t i)
+{
+#if !defined(OF_THREADS)
+	return (*p |= i);
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_or_and_fetch(p, i);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicOr32Barrier(i, p);
+#endif
+}
+
+static OF_INLINE uint32_t
+of_atomic_and32(volatile uint32_t *p, uint32_t i)
+{
+#if !defined(OF_THREADS)
+	return (*p &= i);
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_and_and_fetch(p, i);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicAnd32Barrier(i, p);
+#endif
+}
+
+static OF_INLINE uint32_t
+of_atomic_xor32(volatile uint32_t *p, uint32_t i)
+{
 #if !defined(OF_THREADS)
-# define of_atomic_add32(p, i) (*p += i)
-# define of_atomic_sub32(p, i) (*p -= i)
-# define of_atomic_or32(p, i) (*p |= i)
-# define of_atomic_and32(p, i) (*p &= i)
-# define of_atomic_xor32(p, i) (*p ^= i)
+	return (*p ^= i);
+#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
+	return __sync_xor_and_fetch(p, i);
+#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
+	return OSAtomicXor32Barrier(i, p);
+#endif
+}
 
 static OF_INLINE BOOL
-of_atomic_cmpswap32(int32_t *p, int32_t o, int32_t n)
+of_atomic_cmpswap32(volatile int32_t *p, int32_t o, int32_t n)
 {
+#if !defined(OF_THREADS)
 	if (*p == o) {
 		*p = n;
 		return YES;
 	}
 
 	return NO;
-}
 #elif defined(OF_HAVE_GCC_ATOMIC_OPS)
-# define of_atomic_add32(p, i) __sync_add_and_fetch(p, i)
-# define of_atomic_sub32(p, i) __sync_sub_and_fetch(p, i)
-# define of_atomic_or32(p, i) __sync_or_and_fetch(p, i)
-# define of_atomic_and32(p, i) __sync_and_and_fetch(p, i)
-# define of_atomic_xor32(p, i) __sync_xor_and_fetch(p, i)
-# define of_atomic_cmpswap32(p, o, n) __sync_bool_compare_and_swap(p, o, n)
+	return __sync_bool_compare_and_swap(p, o, n);
 #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
-# include <libkern/OSAtomic.h>
-# define of_atomic_add32(p, i) OSAtomicAdd32Barrier(i, p)
-# define of_atomic_sub32(p, i) OSAtomicAdd32Barriar(-(i), p)
-# define of_atomic_inc32(p) OSAtomicIncrement32Barrier(p)
-# define of_atomic_dec32(p) OSAtomicDecrement32Barrier(p)
-# define of_atomic_or32(p, i) OSAtomicOr32Barrier(i, p)
-# define of_atomic_and32(p, i) OSAtomicAnd32Barrier(i, p)
-# define of_atomic_xor32(p, i) OSAtomicXor32Barrier(i, p)
-# define of_atomic_cmpswap32(p, o, n) OSAtomicCompareAndSwap32Barrier(o, n, p)
-#else
-# error No atomic operations available!
-#endif
-
-#if !defined(OF_THREADS) || defined(OF_HAVE_GCC_ATOMIC_OPS)
-# define of_atomic_inc32(p) of_atomic_add32(p, 1)
-# define of_atomic_dec32(p) of_atomic_sub32(p, 1)
-#endif
+	return OSAtomicCompareAndSwap32Barrier(o, n, p);
+#endif
+}