@@ -23,11 +23,11 @@
 #endif
 
 static OF_INLINE int
 of_atomic_add_int(volatile int *p, int i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p += i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	if (sizeof(int) == 4)
 		__asm__ (
 		    "lock\n\t"
@@ -67,11 +67,11 @@
 }
 
 static OF_INLINE int32_t
 of_atomic_add_32(volatile int32_t *p, int32_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p += i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "lock\n\t"
 	    "xaddl	%0, %2\n\t"
@@ -91,11 +91,11 @@
 }
 
 static OF_INLINE void*
 of_atomic_add_ptr(void* volatile *p, intptr_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*(char* volatile*)p += i);
 #elif defined(OF_X86_ASM)
 	__asm__ (
 	    "lock\n\t"
 	    "xaddl	%0, %2\n\t"
@@ -132,11 +132,11 @@
 }
 
 static OF_INLINE int
 of_atomic_sub_int(volatile int *p, int i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p -= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	if (sizeof(int) == 4)
 		__asm__ (
 		    "negl	%0\n\t"
@@ -178,11 +178,11 @@
 }
 
 static OF_INLINE int32_t
 of_atomic_sub_32(volatile int32_t *p, int32_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p -= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "negl	%0\n\t"
 	    "lock\n\t"
@@ -203,11 +203,11 @@
 }
 
 static OF_INLINE void*
 of_atomic_sub_ptr(void* volatile *p, intptr_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*(char* volatile*)p -= i);
 #elif defined(OF_X86_ASM)
 	__asm__ (
 	    "negl	%0\n\t"
 	    "lock\n\t"
@@ -246,11 +246,11 @@
 }
 
 static OF_INLINE int
 of_atomic_inc_int(volatile int *p)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return ++*p;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	int i;
 
 	if (sizeof(int) == 4)
@@ -296,11 +296,11 @@
 }
 
 static OF_INLINE int32_t
 of_atomic_inc_32(volatile int32_t *p)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return ++*p;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	uint32_t i;
 
 	__asm__ (
@@ -324,11 +324,11 @@
 }
 
 static OF_INLINE int
 of_atomic_dec_int(volatile int *p)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return --*p;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	int i;
 
 	if (sizeof(int) == 4)
@@ -374,11 +374,11 @@
 }
 
 static OF_INLINE int32_t
 of_atomic_dec_32(volatile int32_t *p)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return --*p;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	uint32_t i;
 
 	__asm__ (
@@ -402,11 +402,11 @@
 }
 
 static OF_INLINE unsigned int
 of_atomic_or_int(volatile unsigned int *p, unsigned int i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p |= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	if (sizeof(int) == 4)
 		__asm__ (
 		    "0:\n\t"
@@ -456,11 +456,11 @@
 }
 
 static OF_INLINE uint32_t
 of_atomic_or_32(volatile uint32_t *p, uint32_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p |= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "0:\n\t"
 	    "movl	%2, %0\n\t"
@@ -485,11 +485,11 @@
 }
 
 static OF_INLINE unsigned int
 of_atomic_and_int(volatile unsigned int *p, unsigned int i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p &= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	if (sizeof(int) == 4)
 		__asm__ (
 		    "0:\n\t"
@@ -539,11 +539,11 @@
 }
 
 static OF_INLINE uint32_t
 of_atomic_and_32(volatile uint32_t *p, uint32_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p &= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "0:\n\t"
 	    "movl	%2, %0\n\t"
@@ -568,11 +568,11 @@
 }
 
 static OF_INLINE unsigned int
 of_atomic_xor_int(volatile unsigned int *p, unsigned int i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p ^= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	if (sizeof(int) == 4)
 		__asm__ (
 		    "0:\n\t"
@@ -622,11 +622,11 @@
 }
 
 static OF_INLINE uint32_t
 of_atomic_xor_32(volatile uint32_t *p, uint32_t i)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	return (*p ^= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "0:\n\t"
 	    "movl	%2, %0\n\t"
@@ -651,11 +651,11 @@
 }
 
 static OF_INLINE BOOL
 of_atomic_cmpswap_int(volatile int *p, int o, int n)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
 		return YES;
 	}
 
@@ -685,11 +685,11 @@
 }
 
 static OF_INLINE BOOL
 of_atomic_cmpswap_32(volatile int32_t *p, int32_t o, int32_t n)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
 		return YES;
 	}
 
@@ -719,11 +719,11 @@
 }
 
 static OF_INLINE BOOL
 of_atomic_cmpswap_ptr(void* volatile *p, void *o, void *n)
 {
-#if !defined(OF_THREADS)
+#if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
 		return YES;
 	}