@@ -20,30 +20,30 @@
 #include <stdlib.h>
 
 #import "OFObject.h"
 #import "OFSystemInfo.h"
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 # import "threading.h"
 #endif
 #import "macros.h"
 
 #import "autorelease.h"
 
-#if defined(OF_COMPILER_TLS)
+#if defined(OF_HAVE_COMPILER_TLS)
 static __thread id *objects = NULL;
 static __thread id *top = NULL;
 static __thread size_t size = 0;
-#elif defined(OF_THREADS)
+#elif defined(OF_HAVE_THREADS)
 static of_tlskey_t objectsKey, topKey, sizeKey;
 #else
 static id *objects = NULL;
 static id *top = NULL;
 static size_t size = 0;
 #endif
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 static void __attribute__((constructor))
 init(void)
 {
 	OF_ENSURE(of_tlskey_new(&objectsKey));
 	OF_ENSURE(of_tlskey_new(&topKey));
@@ -52,11 +52,11 @@
 #endif
 
 void*
 objc_autoreleasePoolPush()
 {
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	id *top = of_tlskey_get(topKey);
 	id *objects = of_tlskey_get(objectsKey);
 #endif
 	ptrdiff_t offset = top - objects;
 
@@ -64,11 +64,11 @@
 }
 
 void
 objc_autoreleasePoolPop(void *offset)
 {
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	id *top = of_tlskey_get(topKey);
 	id *objects = of_tlskey_get(objectsKey);
 #endif
 	id *pool = objects + (ptrdiff_t)offset;
 	id *iter;
@@ -83,20 +83,20 @@
 
 		objects = NULL;
 		top = NULL;
 	}
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	OF_ENSURE(of_tlskey_set(topKey, top));
 	OF_ENSURE(of_tlskey_set(objectsKey, objects));
 #endif
 }
 
 id
 _objc_rootAutorelease(id object)
 {
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	id *top = of_tlskey_get(topKey);
 	id *objects = of_tlskey_get(objectsKey);
 	size_t size = (size_t)(uintptr_t)of_tlskey_get(sizeKey);
 #endif
 
@@ -105,11 +105,11 @@
 
 		OF_ENSURE((objects = malloc(size)) != NULL);
 
 		top = objects;
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 		OF_ENSURE(of_tlskey_set(objectsKey, objects));
 		OF_ENSURE(of_tlskey_set(sizeKey, (void*)(uintptr_t)size));
 #endif
 	}
 
@@ -117,11 +117,11 @@
 		ptrdiff_t diff = top - objects;
 
 		size += [OFSystemInfo pageSize];
 		OF_ENSURE((objects = realloc(objects, size)) != NULL);
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 		OF_ENSURE(of_tlskey_set(objectsKey, objects));
 		OF_ENSURE(of_tlskey_set(sizeKey, (void*)(uintptr_t)size));
 #endif
 
 		top = objects + diff;
@@ -128,11 +128,11 @@
 	}
 
 	*top = object;
 	top++;
 
-#if !defined(OF_COMPILER_TLS) && defined(OF_THREADS)
+#if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	OF_ENSURE(of_tlskey_set(topKey, top));
 #endif
 
 	return object;
 }