@@ -26,11 +26,11 @@ #include #include "platform.h" -#ifdef OF_MAC_OS_X +#ifdef OF_MACOS # include #endif #import "OFSystemInfo.h" #import "OFString.h" @@ -38,11 +38,11 @@ #import "OFDictionary.h" #import "OFApplication.h" #import "OFNotImplementedException.h" -#if defined(OF_MAC_OS_X) || defined(OF_IOS) +#if defined(OF_MACOS) || defined(OF_IOS) # ifdef HAVE_SYSDIR_H # include # else # include # endif @@ -143,11 +143,11 @@ return numberOfCPUs; } + (OFString*)userDataPath { -#if defined(OF_MAC_OS_X) || defined(OF_IOS) +#if defined(OF_MACOS) || defined(OF_IOS) void *pool = objc_autoreleasePoolPush(); char pathC[PATH_MAX]; OFMutableString *path; OFString *home; @@ -233,11 +233,11 @@ #endif } + (OFString*)userConfigPath { -#if defined(OF_MAC_OS_X) || defined(OF_IOS) +#if defined(OF_MACOS) || defined(OF_IOS) void *pool = objc_autoreleasePoolPush(); char pathC[PATH_MAX]; OFMutableString *path; OFString *home; @@ -393,11 +393,11 @@ #endif #if defined(OF_POWERPC) || defined(OF_POWERPC64) + (bool)supportsAltiVec { -# ifdef OF_MAC_OS_X +# ifdef OF_MACOS int name[2] = { CTL_HW, HW_VECTORUNIT }, value = 0; size_t length = sizeof(value); if (sysctl(name, 2, &value, &length, NULL, 0) == 0) return value;