@@ -34,11 +34,11 @@
 #import "OFThread+Private.h"
 
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
-#if defined(OF_MAC_OS_X)
+#if defined(OF_MACOS)
 # include <crt_externs.h>
 #elif defined(OF_WINDOWS)
 # include <windows.h>
 
 extern int _CRT_glob;
@@ -191,11 +191,11 @@
 	self = [super init];
 
 	@try {
 		void *pool;
 		OFMutableDictionary *environment;
-#if defined(OF_MAC_OS_X)
+#if defined(OF_MACOS)
 		char **env = *_NSGetEnviron();
 #elif defined(OF_WINDOWS)
 		of_char16_t *env, *env0;
 #elif !defined(OF_IOS)
 		char **env = environ;