Index: src/atomic.h
==================================================================
--- src/atomic.h
+++ src/atomic.h
@@ -10,30 +10,45 @@
  */
 
 #import "objfw-defs.h"
 
 #if !defined(OF_THREADS)
-# define of_atomic_inc32(p) ++(*p)
-# define of_atomic_dec32(p) --(*p)
+# 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)
 # define of_atomic_cmpswap32(p, o, n) (*p == o ? ((*p = n) ? 1 : 1) : 0)
 #elif defined(OF_HAVE_GCC_ATOMIC_OPS)
-# define of_atomic_inc32(p) __sync_add_and_fetch(p, 1)
-# define of_atomic_dec32(p) __sync_sub_and_fetch(p, 1)
+# 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)
 #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
 # include <libkern/OSAtomic.h>
-# define of_atomic_inc32(p) OSAtomicIncrement32Barrier((int32_t*)(p))
-# define of_atomic_dec32(p) OSAtomicDecrement32Barrier((int32_t*)(p))
-# define of_atomic_cmpswap32(p, o, n) \
-	OSAtomicCompareAndSwap32Barrier(o, n, (int32_t*)p)
+# 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
 
 typedef int32_t of_spinlock_t;
 #ifdef OF_THREADS
 # define of_spinlock_lock(s) while (!of_atomic_cmpswap32(&s, 0, 1));
 # define of_spinlock_unlock(s) s = 0
 #else
 # define of_spinlock_lock(s)
 # define of_spinlock_unlock(s)
 #endif