Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -53,11 +53,11 @@
 static of_tlskey_t thread_self;
 
 static id
 call_main(id obj)
 {
-#ifndef OF_APPLE_RUNTIME
+#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
 	objc_thread_add();
 #endif
 
 	if (!of_tlskey_set(thread_self, obj))
 		@throw [OFInitializationFailedException
@@ -76,11 +76,11 @@
 	[OFTLSKey callAllDestructors];
 	[OFAutoreleasePool releaseAll];
 
 	[obj release];
 
-#ifndef OF_APPLE_RUNTIME
+#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
 	objc_thread_remove();
 #endif
 
 	return 0;
 }
@@ -219,11 +219,11 @@
 	[OFTLSKey callAllDestructors];
 	[OFAutoreleasePool releaseAll];
 
 	[thread release];
 
-#ifndef OF_APPLE_RUNTIME
+#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
 	objc_thread_remove();
 #endif
 
 	of_thread_exit();
 }