From 88a918ee48f95841b7d4007ec877e2a6a52c06c1 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 09:14:10 -0700 Subject: [PATCH 01/10] TARGET_DEPLOYMENT_FREEBSD -> TARGET_OS_BSD --- CMakeLists.txt | 1 - CoreFoundation/Base.subproj/CFFileUtilities.c | 4 ++-- CoreFoundation/Base.subproj/CFInternal.h | 2 +- CoreFoundation/Base.subproj/CFPlatform.c | 10 +++++----- CoreFoundation/Base.subproj/CFRuntime.c | 4 ++-- CoreFoundation/Base.subproj/CFUtilities.c | 4 ++-- .../Base.subproj/CoreFoundation_Prefix.h | 4 ++-- .../Base.subproj/ForFoundationOnly.h | 2 +- CoreFoundation/CMakeLists.txt | 4 ---- CoreFoundation/Locale.subproj/CFLocale.c | 2 +- CoreFoundation/NumberDate.subproj/CFDate.c | 6 +++--- CoreFoundation/NumberDate.subproj/CFNumber.c | 2 +- .../PlugIn.subproj/CFBundle_BinaryTypes.h | 2 +- .../PlugIn.subproj/CFBundle_Resources.c | 4 ++-- CoreFoundation/RunLoop.subproj/CFSocket.c | 4 ++-- CoreFoundation/String.subproj/CFString.c | 6 +++--- .../StringEncodings.subproj/CFUniChar.c | 20 +++++++++---------- CoreFoundation/URL.subproj/CFURLAccess.c | 4 ++-- CoreFoundation/build.py | 2 +- build.py | 2 +- 20 files changed, 42 insertions(+), 47 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55ecc5b17e..61d67d3e36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android OR CMAKE_SYSTEM_NAME STREQUAL Linux) elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(deployment_target -DDEPLOYMENT_TARGET_MACOSX) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - set(deployment_target -DDEPLOYMENT_TARGET_FREEBSD) set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN") set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR}) elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index d64cb25443..a5f05de5e9 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, FindClose(handle); pathBuf[pathLength] = '\0'; -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uint8_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla if (dent->d_type == DT_DIR) { isDirectory = true; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD else if (dent->d_type == DT_UNKNOWN) { // We need to do an additional stat on this to see if it's really a directory or not. // This path should be uncommon. diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index 480ffa5187..e840da015e 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -543,7 +543,7 @@ CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) { return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0); } -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD typedef int32_t CFLock_t; #define CFLockInit 0 diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index b8fd3c10a0..92fb0cfd24 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) { } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include @@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) { CF_EXPORT CFStringRef CFCopyUserName(void) { CFStringRef result = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uid_t euid; __CFGetUGIDs(&euid, NULL); struct passwd *upwd = getpwuid(euid ? euid : getuid()); @@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); #elif DEPLOYMENT_TARGET_WINDOWS CFURLRef retVal = NULL; @@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (!uName) { return _CFCopyHomeDirURLForUser(NULL, true); } else { @@ -1182,7 +1182,7 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) { #pragma mark - #pragma mark Linux OSAtomic -#if defined(DEPLOYMENT_TARGET_LINUX) || defined(DEPLOYMENT_TARGET_FREEBSD) +#if defined(DEPLOYMENT_TARGET_LINUX) || TARGET_OS_BSD bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst) { diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 3ccc419704..4b6b20150b 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -52,7 +52,7 @@ __kCFReleaseEvent = 29 #if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include -#elif DEPLOYMENT_TARGET_FREEBSD +#elif TARGET_OS_BSD #include // malloc() #else #include @@ -1106,7 +1106,7 @@ _CFThreadRef _CF_pthread_main_thread_np(void) { -#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static void __CFInitialize(void) __attribute__ ((constructor)); static #endif diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index 042ad1640e..172ba6d51f 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -59,7 +59,7 @@ #include #endif -#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #endif @@ -1239,7 +1239,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (0LL == statBuf.st_size) { bytes = malloc(8); // don't return constant string -- it's freed! length = 0; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } else if (map) { if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) { int32_t savederrno = errno; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index cef00a6039..badf9e36e9 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -138,7 +138,7 @@ typedef int boolean_t; #endif #endif -#if DEPLOYMENT_TARGET_FREEBSD +#if TARGET_OS_BSD #include #include // mode_t #endif @@ -234,7 +234,7 @@ CF_INLINE uint64_t mach_absolute_time() { #endif -#if DEPLOYMENT_TARGET_FREEBSD +#if TARGET_OS_BSD #define HAVE_STRUCT_TIMESPEC 1 #define CF_PRIVATE extern __attribute__((visibility("hidden"))) diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index 4ae547667f..4cc57cb2fe 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -48,7 +48,7 @@ CF_IMPLICIT_BRIDGING_DISABLED #if DEPLOYMENT_TARGET_LINUX #include -#elif DEPLOYMENT_TARGET_FREEBSD +#elif TARGET_OS_BSD #include // malloc() #elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI #include diff --git a/CoreFoundation/CMakeLists.txt b/CoreFoundation/CMakeLists.txt index 631f4beac2..49f5c1d6e5 100644 --- a/CoreFoundation/CMakeLists.txt +++ b/CoreFoundation/CMakeLists.txt @@ -343,10 +343,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android) PRIVATE -DHAVE_SCHED_GETAFFINITY) endif() -elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - target_compile_definitions(CoreFoundation - PRIVATE - -DDEPLOYMENT_TARGET_FREEBSD) elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) target_compile_definitions(CoreFoundation PRIVATE diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index 69d4ae99cd..fde6501b73 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index 792b7f77ca..f01a7ba099 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -26,7 +26,7 @@ #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -114,7 +114,7 @@ CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED uint64_t tsr = mach_absolute_time(); return (CFTimeInterval)((double)tsr * __CF1_TSRRate); -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD struct timespec res; if (clock_gettime(CLOCK_MONOTONIC, &res) != 0) { HALT; @@ -176,7 +176,7 @@ CF_PRIVATE void __CFDateInitialize(void) { } __CFTSRRate = (double)freq.QuadPart; __CF1_TSRRate = 1.0 / __CFTSRRate; -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD struct timespec res; if (clock_getres(CLOCK_MONOTONIC, &res) != 0) { HALT; diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index 566856c253..7d9abe2b20 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -180,7 +180,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define BITSFORDOUBLEZERO doubleZeroBits.bits #define BITSFORDOUBLEONE doubleOneBits.bits -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h index ad4a470f6e..bfbcdc0796 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h +++ b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h @@ -26,7 +26,7 @@ CF_EXTERN_C_BEGIN #define USE_DYLD_PRIV 1 #elif DEPLOYMENT_TARGET_WINDOWS #define BINARY_SUPPORT_DLL 1 -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define BINARY_SUPPORT_DLFCN 1 #else #error Unknown or unspecified DEPLOYMENT_TARGET diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index ae9769a018..825d43e0ab 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -302,7 +302,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { #else return CFSTR("Linux"); #endif -#elif DEPLOYMENT_TARGET_FREEBSD +#elif TARGET_OS_BSD return CFSTR("FreeBSD"); #else #error Unknown or unspecified DEPLOYMENT_TARGET @@ -324,7 +324,7 @@ CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { #else return CFSTR("Linux"); #endif -#elif DEPLOYMENT_TARGET_FREEBSD +#elif TARGET_OS_BSD return CFSTR("FreeBSD"); #else #error Unknown or unspecified DEPLOYMENT_TARGET diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 8b92c2e7ba..b7093ddbdd 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -1117,7 +1117,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define INVALID_SOCKET (CFSocketNativeHandle)(-1) #define closesocket(a) close((a)) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) @@ -2615,7 +2615,7 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN if (INVALID_SOCKET != sock) CFDictionaryAddValue(__CFAllSockets, (void *)(uintptr_t)sock, memory); if (NULL == __CFSocketManagerThread) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD _CFThreadRef tid = 0; pthread_attr_t attr; pthread_attr_init(&attr); diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index fb988a17da..8d93691a54 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -34,7 +34,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -4657,7 +4657,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (((encoding & 0x0FFF) == kCFStringEncodingUnicode) && ((encoding == kCFStringEncodingUnicode) || ((encoding > kCFStringEncodingUTF8) && (encoding <= kCFStringEncodingUTF32LE)))) { guessedByteLength = (length + 1) * ((((encoding >> 26) & 2) == 0) ? sizeof(UTF16Char) : sizeof(UTF32Char)); // UTF32 format has the bit set } else if (((guessedByteLength = CFStringGetMaximumSizeForEncoding(length, encoding)) > length) && !CF_IS_OBJC(_kCFRuntimeIDCFString, string) && !CF_IS_SWIFT(_kCFRuntimeIDCFString, string)) { // Multi byte encoding -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (__CFStrIsUnicode(string)) { CFIndex aLength = CFStringEncodingByteLengthForCharacters(encoding, kCFStringEncodingPrependBOM, __CFStrContents(string), __CFStrLength(string)); if (aLength > 0) guessedByteLength = aLength; @@ -4671,7 +4671,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (guessedByteLength == length && __CFStrIsEightBit(string) && __CFStringEncodingIsSupersetOfASCII(encoding)) { // It's all ASCII !! return CFDataCreate(alloc, ((uint8_t *)__CFStrContents(string) + __CFStrSkipAnyLengthByte(string)), __CFStrLength(string)); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } #endif } diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index 0c76c9a9ed..b7540374a8 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -15,7 +15,7 @@ #include "CFStringEncodingConverterExt.h" #include "CFUnicodeDecomposition.h" #include "CFUniCharPriv.h" -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -34,7 +34,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED #define __kCFCharacterSetDir "/System/Library/CoreServices" -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_EMBEDDED_MINI #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" #elif DEPLOYMENT_TARGET_WINDOWS #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" @@ -42,7 +42,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED #define USE_MACHO_SEGMENT 1 -#elif DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD || DEPLOYMENT_TARGET_WINDOWS) +#elif DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) #define USE_RAW_SYMBOL 1 #endif @@ -107,7 +107,7 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, // Memory map the file -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { @@ -116,7 +116,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #endif #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif DEPLOYMENT_TARGET_WINDOWS wchar_t frameworkPath[MAXPATHLEN]; @@ -171,7 +171,7 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { #elif DEPLOYMENT_TARGET_WINDOWS static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { @@ -238,7 +238,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #endif // USE_MACHO_SEGMENT -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if !defined(CF_UNICHAR_BITMAP_FILE) #if USE_MACHO_SEGMENT #define CF_UNICHAR_BITMAP_FILE "__csbitmaps" @@ -254,7 +254,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -286,7 +286,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -308,7 +308,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICODE_DATA_SYM __CFUnicodeDataL #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_MACHO_SEGMENT *bytes = __CFGetSectDataPtr("__UNICODE", bitmapName, NULL); diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index 29bae7b2d3..a1e0ec8277 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -24,7 +24,7 @@ CFData read/write routines #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -233,7 +233,7 @@ static Boolean _CFFileURLWritePropertiesToResource(CFURLRef url, CFDictionaryRef CFNumberRef modeNum = (CFNumberRef)value; CFNumberGetValue(modeNum, kCFNumberSInt32Type, &mode); } else { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD +#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define MODE_TYPE mode_t #elif DEPLOYMENT_TARGET_WINDOWS #define MODE_TYPE uint16_t diff --git a/CoreFoundation/build.py b/CoreFoundation/build.py index b0a255a90b..a07f1d9ad1 100755 --- a/CoreFoundation/build.py +++ b/CoreFoundation/build.py @@ -18,7 +18,7 @@ cf.LDFLAGS = '-Wl,-Bsymbolic ' Configuration.current.requires_pkg_config = True elif Configuration.current.target.sdk == OSType.FreeBSD: - cf.CFLAGS = '-DDEPLOYMENT_TARGET_FREEBSD -I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' + cf.CFLAGS = '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' cf.LDFLAGS = '' elif Configuration.current.target.sdk == OSType.MacOSX: cf.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX ' diff --git a/build.py b/build.py index 8ee475f374..39157622ae 100755 --- a/build.py +++ b/build.py @@ -19,7 +19,7 @@ foundation.LDFLAGS = '${SWIFT_USE_LINKER} -lswiftGlibc -Wl,-Bsymbolic ' Configuration.current.requires_pkg_config = True elif Configuration.current.target.sdk == OSType.FreeBSD: - foundation.CFLAGS = '-DDEPLOYMENT_TARGET_FREEBSD -I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' + foundation.CFLAGS = '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' foundation.LDFLAGS = '' elif Configuration.current.target.sdk == OSType.MacOSX: foundation.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX ' From 7a2b6659a122ccd7bf3dd2976e5b0b7ab10ec92c Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 09:33:02 -0700 Subject: [PATCH 02/10] DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI -> TARGET_OS_IPHONE --- CoreFoundation/Base.subproj/CFBase.c | 34 ++++++++-------- CoreFoundation/Base.subproj/CFFileUtilities.c | 4 +- CoreFoundation/Base.subproj/CFInternal.h | 4 +- .../Base.subproj/CFKnownLocations.c | 2 +- CoreFoundation/Base.subproj/CFPlatform.c | 28 ++++++------- CoreFoundation/Base.subproj/CFRuntime.c | 8 ++-- CoreFoundation/Base.subproj/CFUtilities.c | 28 ++++++------- .../Base.subproj/CoreFoundation_Prefix.h | 2 +- .../Base.subproj/ForFoundationOnly.h | 4 +- .../Collections.subproj/CFBasicHash.c | 2 +- CoreFoundation/Collections.subproj/CFData.c | 2 +- .../Locale.subproj/CFDateFormatter.c | 4 +- CoreFoundation/NumberDate.subproj/CFDate.c | 4 +- CoreFoundation/NumberDate.subproj/CFNumber.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle.c | 6 +-- .../PlugIn.subproj/CFBundle_BinaryTypes.h | 2 +- .../PlugIn.subproj/CFBundle_Executable.c | 6 +-- .../PlugIn.subproj/CFBundle_Resources.c | 6 +-- .../PlugIn.subproj/CFBundle_Tables.c | 2 +- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 40 +++++++++---------- CoreFoundation/RunLoop.subproj/CFSocket.c | 24 +++++------ .../Stream.subproj/CFConcreteStreams.c | 6 +-- CoreFoundation/String.subproj/CFBurstTrie.c | 2 +- CoreFoundation/String.subproj/CFString.c | 18 ++++----- .../CFStringEncodingConverter.c | 2 +- .../StringEncodings.subproj/CFUniChar.c | 14 +++---- CoreFoundation/URL.subproj/CFURL.c | 12 +++--- CoreFoundation/URL.subproj/CFURL.inc.h | 2 +- CoreFoundation/URL.subproj/CFURLAccess.c | 6 +-- 29 files changed, 138 insertions(+), 138 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFBase.c b/CoreFoundation/Base.subproj/CFBase.c index 233e67f341..8b4a3d34a9 100644 --- a/CoreFoundation/Base.subproj/CFBase.c +++ b/CoreFoundation/Base.subproj/CFBase.c @@ -17,7 +17,7 @@ #if _POSIX_THREADS #include #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #include @@ -29,7 +29,7 @@ struct __CFAllocator { CFRuntimeBase _base; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // CFAllocator structure must match struct _malloc_zone_t! // The first two reserved fields in struct _malloc_zone_t are for us with CFRuntimeBase size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */ @@ -465,7 +465,7 @@ void CFAllocatorSetDefault(CFAllocatorRef allocator) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; // require allocator to this function to be an allocator } @@ -491,7 +491,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC CFAllocatorRetainCallBack retainFunc; CFAllocatorAllocateCallBack allocateFunc; void *retainedInfo; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator && kCFAllocatorUseContext != allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return NULL; // require allocator to this function to be an allocator } @@ -525,7 +525,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC memset(memory, 0, sizeof(CFRuntimeBase)); __CFRuntimeSetRC(memory, 1); _CFAllocatorSetInstanceTypeIDAndIsa(memory); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE memory->size = __CFAllocatorCustomSize; memory->malloc = __CFAllocatorCustomMalloc; memory->calloc = __CFAllocatorCustomCalloc; @@ -574,7 +574,7 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -582,7 +582,7 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif if (0 == size) return NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_malloc((malloc_zone_t *)allocator, size); } @@ -605,7 +605,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -613,7 +613,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif if (NULL == ptr && 0 < newsize) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_malloc((malloc_zone_t *)allocator, newsize); } @@ -626,7 +626,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return newptr; } if (NULL != ptr && 0 == newsize) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -643,7 +643,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return NULL; } if (NULL == ptr && 0 == newsize) return NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_realloc((malloc_zone_t *)allocator, ptr, newsize); } @@ -661,14 +661,14 @@ void CFAllocatorDeallocate(CFAllocatorRef allocator, void *ptr) { allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -691,14 +691,14 @@ CFIndex CFAllocatorGetPreferredSizeForSize(CFAllocatorRef allocator, CFIndex siz allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_good_size(size); } @@ -716,7 +716,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -724,7 +724,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif CFAssert1(0 == context->version, __kCFLogAssertion, "%s(): context version not initialized to 0", __PRETTY_FUNCTION__); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; } diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index a5f05de5e9..af3ae4dddd 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, FindClose(handle); pathBuf[pathLength] = '\0'; -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uint8_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla if (dent->d_type == DT_DIR) { isDirectory = true; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD else if (dent->d_type == DT_UNKNOWN) { // We need to do an additional stat on this to see if it's really a directory or not. // This path should be uncommon. diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index e840da015e..c336c1de2d 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -166,7 +166,7 @@ CF_EXPORT CFArrayRef _CFGetWindowsBinaryDirectories(void); CF_EXPORT CFStringRef _CFStringCreateHostName(void); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include CF_EXPORT void _CFMachPortInstallNotifyPort(CFRunLoopRef rl, CFStringRef mode); #endif @@ -678,7 +678,7 @@ CF_PRIVATE void _CF_dispatch_once(dispatch_once_t *, void (^)(void)); #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE _Atomic(uint8_t) __CF120293; CF_PRIVATE _Atomic(uint8_t) __CF120290; extern void __THE_PROCESS_HAS_FORKED_AND_YOU_CANNOT_USE_THIS_COREFOUNDATION_FUNCTIONALITY___YOU_MUST_EXEC__(void); diff --git a/CoreFoundation/Base.subproj/CFKnownLocations.c b/CoreFoundation/Base.subproj/CFKnownLocations.c index c610813fdc..4d987a859c 100644 --- a/CoreFoundation/Base.subproj/CFKnownLocations.c +++ b/CoreFoundation/Base.subproj/CFKnownLocations.c @@ -18,7 +18,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUser user, CFStringRef _Nullable username) { CFURLRef location = NULL; -#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) /* Building for a Darwin OS. (We use these paths on Swift builds as well, so that we can interoperate a little with Darwin's defaults(1) command and the other system facilities; but you want to use the system version of CF if possible on those platforms, which will talk to cfprefsd(8) and has stronger interprocess consistency guarantees.) diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index 92fb0cfd24..038658a848 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -11,7 +11,7 @@ #include "CFInternal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #include @@ -35,7 +35,7 @@ #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #define kCFPlatformInterfaceStringEncoding kCFStringEncodingUTF8 #else #define kCFPlatformInterfaceStringEncoding CFStringGetSystemEncoding() @@ -43,7 +43,7 @@ extern void __CFGetUGIDs(uid_t *euid, gid_t *egid); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // CoreGraphics and LaunchServices are only projects (1 Dec 2006) that use these char **_CFArgv(void) { return *_NSGetArgv(); } int _CFArgc(void) { return *_NSGetArgc(); } @@ -126,13 +126,13 @@ const char *_CFProcessPath(void) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) { return pthread_main_np() == 1; } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE const char *_CFProcessPath(void) { if (__CFProcessPath) return __CFProcessPath; #if DEPLOYMENT_TARGET_MACOSX @@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) { } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include @@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) { CF_EXPORT CFStringRef CFCopyUserName(void) { CFStringRef result = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uid_t euid; __CFGetUGIDs(&euid, NULL); struct passwd *upwd = getpwuid(euid ? euid : getuid()); @@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); #elif DEPLOYMENT_TARGET_WINDOWS CFURLRef retVal = NULL; @@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (!uName) { return _CFCopyHomeDirURLForUser(NULL, true); } else { @@ -612,7 +612,7 @@ CF_PRIVATE void __CFTSDInitialize() { #endif static void __CFTSDSetSpecific(void *arg) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE pthread_setspecific(__CFTSDIndexKey, arg); #elif DEPLOYMENT_TARGET_LINUX pthread_setspecific(__CFTSDIndexKey, arg); @@ -622,7 +622,7 @@ static void __CFTSDSetSpecific(void *arg) { } static void *__CFTSDGetSpecific() { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE return pthread_getspecific(__CFTSDIndexKey); #elif DEPLOYMENT_TARGET_LINUX return pthread_getspecific(__CFTSDIndexKey); @@ -674,7 +674,7 @@ static void __CFTSDFinalize(void *arg) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE extern int pthread_key_init_np(int, void (*)(void *)); #endif @@ -1463,7 +1463,7 @@ typedef struct tagTHREADNAME_INFO #endif CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_Nonnull name) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (pthread_equal(pthread_self(), thread)) { return pthread_setname_np(name); } @@ -1489,7 +1489,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ } CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE return pthread_getname_np(pthread_self(), buf, length); #elif DEPLOYMENT_TARGET_LINUX return pthread_getname_np(pthread_self(), buf, length); diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 4b6b20150b..7596a4ced2 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -21,7 +21,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #include @@ -971,7 +971,7 @@ CF_PRIVATE void __CFTSDWindowsCleanup(void); CF_PRIVATE void __CFFinalizeWindowsThreadData(); #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE _Atomic(uint8_t) __CF120290 = false; static _Atomic(uint8_t) __CF120291 = false; _Atomic(uint8_t) __CF120293 = false; @@ -1145,7 +1145,7 @@ void __CFInitialize(void) { } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE UInt32 s, r; __CFStringGetUserDefaultEncoding(&s, &r); // force the potential setenv to occur early pthread_atfork(__01121__, NULL, __01123__); @@ -1205,7 +1205,7 @@ void __CFInitialize(void) { { CFIndex idx, cnt = 0; char **args = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE args = *_NSGetArgv(); cnt = *_NSGetArgc(); #elif DEPLOYMENT_TARGET_WINDOWS diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index 172ba6d51f..c527d0325b 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -37,7 +37,7 @@ #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #include @@ -159,7 +159,7 @@ CFHashCode CFHashBytes(uint8_t *bytes, CFIndex length) { #undef ELF_STEP -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE uintptr_t __CFFindPointer(uintptr_t ptr, uintptr_t start) { vm_map_t task = mach_task_self(); mach_vm_address_t address = start; @@ -249,7 +249,7 @@ static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRe static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) { CFPropertyListRef plist = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CFDataRef data; CFURLRef url; @@ -448,7 +448,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL); v = (v + (v >> 4)) & 0xf0f0f0f0f0f0f0fULL; pcnt = (v * 0x0101010101010101ULL) >> ((sizeof(v) - 1) * 8); -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_AVAILCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -475,7 +475,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { CF_PRIVATE CFIndex __CFProcessorCount() { int32_t pcnt; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -493,7 +493,7 @@ CF_PRIVATE CFIndex __CFProcessorCount() { CF_PRIVATE uint64_t __CFMemorySize() { uint64_t memsize = 0; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(memsize); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &memsize, &len, NULL, 0); @@ -557,7 +557,7 @@ typedef struct _ugids { CF_PRIVATE void __CFGetUGIDs(uid_t *euid, gid_t *egid) { ugids(^lookup)(void) = ^{ ugids ids; -#if 1 && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) +#if 1 && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) if (0 != pthread_getugid_np(&ids._euid, &ids._egid)) #endif { @@ -679,7 +679,7 @@ static void _CFShowToFile(FILE *file, Boolean flush, const void *obj) { } } if (!lastNL) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE fprintf_l(file, NULL, "\n"); #else fprintf(file, "\n"); @@ -798,7 +798,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann int32_t minute = mine.tm_min; int32_t second = mine.tm_sec; int32_t ms = (int32_t)floor(1000.0 * modf(at, &dummy)); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%llu] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), tid); @@ -814,7 +814,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann } static void _logToStderr(char *banner, const char *message, size_t length) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE struct iovec v[3]; v[0].iov_base = banner; v[0].iov_len = banner ? strlen(banner) : 0; @@ -928,7 +928,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(void *, const void *), CFStringRef (*contextDescFunc)(void *, const void *, const void *, bool, bool *), CFDictionaryRef formatOptions, int32_t lev, CFStringRef format, va_list args, _cf_logging_style loggingStyle) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE uintptr_t val = (uintptr_t)_CFGetTSD(__CFTSDKeyIsInCFLog); if (3 < val) return; // allow up to 4 nested invocations _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)(val + 1), NULL); @@ -954,7 +954,7 @@ static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(voi } if (buf) free(buf); if (str) CFRelease(str); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)val, NULL); #endif } @@ -1208,7 +1208,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (errorPtr) *errorPtr = _CFErrorWithFilePathCodeDomain(kCFErrorDomainPOSIX, errno, path); return false; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (uncached) (void)fcntl(fd, F_NOCACHE, 1); // Non-zero arg turns off caching; we ignore error as uncached is just a hint #endif if (fstat(fd, &statBuf) < 0) { @@ -1239,7 +1239,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (0LL == statBuf.st_size) { bytes = malloc(8); // don't return constant string -- it's freed! length = 0; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } else if (map) { if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) { int32_t savederrno = errno; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index badf9e36e9..749696d6a2 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -73,7 +73,7 @@ typedef char * Class; #define CRSetCrashLogMessage(A) do {} while (0) #define CRSetCrashLogMessage2(A) do {} while (0) -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #endif diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index 4cc57cb2fe..dae697340a 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -50,7 +50,7 @@ CF_IMPLICIT_BRIDGING_DISABLED #include #elif TARGET_OS_BSD #include // malloc() -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #endif @@ -572,7 +572,7 @@ CF_CROSS_PLATFORM_EXPORT void _CFDataInit(CFMutableDataRef memory, CFOptionFlags CF_EXPORT CFRange _CFDataFindBytes(CFDataRef data, CFDataRef dataToFind, CFRange searchRange, CFDataSearchFlags compareOptions); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #if !defined(__CFReadTSR) #define __CFReadTSR() mach_absolute_time() #endif diff --git a/CoreFoundation/Collections.subproj/CFBasicHash.c b/CoreFoundation/Collections.subproj/CFBasicHash.c index 53d24b9cdf..fdf9ffdc1d 100644 --- a/CoreFoundation/Collections.subproj/CFBasicHash.c +++ b/CoreFoundation/Collections.subproj/CFBasicHash.c @@ -1588,7 +1588,7 @@ CF_PRIVATE CFBasicHashRef CFBasicHashCreate(CFAllocatorRef allocator, CFOptionFl ht->bits.counts_offset = (flags & kCFBasicHashHasCounts) ? offset++ : 0; ht->bits.hashes_offset = (flags & kCFBasicHashHasHashCache) ? offset++ : 0; -#if DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if TARGET_OS_IPHONE ht->bits.hashes_offset = 0; ht->bits.strong_values = 0; ht->bits.strong_keys = 0; diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index d3846ca601..a3ee2d8c23 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -34,7 +34,7 @@ static Boolean _CFDataShouldBridgeToSwift(CFTypeID type, CFDataRef data); #define CFDATA_MAX_SIZE ((1ULL << 31) - 1) #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include CF_INLINE unsigned long __CFPageSize() { return vm_page_size; } #elif DEPLOYMENT_TARGET_WINDOWS diff --git a/CoreFoundation/Locale.subproj/CFDateFormatter.c b/CoreFoundation/Locale.subproj/CFDateFormatter.c index e889fd553b..648835c71f 100644 --- a/CoreFoundation/Locale.subproj/CFDateFormatter.c +++ b/CoreFoundation/Locale.subproj/CFDateFormatter.c @@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) { int32_t years = 0; __cficu_ucal_clear(calendar); @@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter } } } else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX __cficu_ucal_clear(cal); __cficu_ucal_set(cal, UCAL_ERA, 1); __cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index f01a7ba099..e2594e4cde 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -26,7 +26,7 @@ #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -164,7 +164,7 @@ const CFRuntimeClass __CFDateClass = { }; CF_PRIVATE void __CFDateInitialize(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE struct mach_timebase_info info; mach_timebase_info(&info); __CFTSRRate = (1.0E9 / (double)info.numer) * (double)info.denom; diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index 7d9abe2b20..07e7f7ca9e 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -180,7 +180,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define BITSFORDOUBLEZERO doubleZeroBits.bits #define BITSFORDOUBLEONE doubleOneBits.bits -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/CoreFoundation/PlugIn.subproj/CFBundle.c index 9cba868372..319f95c5e6 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle.c @@ -39,7 +39,7 @@ #endif #endif /* BINARY_SUPPORT_DLFCN */ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #elif DEPLOYMENT_TARGET_WINDOWS #include @@ -512,7 +512,7 @@ CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } result = _CFBundleGetFromTables(bundleID); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); @@ -762,7 +762,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL, bundle->_sharesStringsFiles = false; bundle->_isUnique = unique; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (!__CFgetenv("CFBundleDisableStringsSharing") && (strncmp(buff, "/System/Library/Frameworks", 26) == 0) && (strncmp(buff + strlen(buff) - 10, ".framework", 10) == 0)) bundle->_sharesStringsFiles = true; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h index bfbcdc0796..15c97fe9c7 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h +++ b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h @@ -20,7 +20,7 @@ CF_EXTERN_C_BEGIN #else #define USE_DYLD_PRIV 1 #endif -#elif DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif TARGET_OS_IPHONE #define BINARY_SUPPORT_DYLD 1 #define BINARY_SUPPORT_DLFCN 1 #define USE_DYLD_PRIV 1 diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index b4c5c64e71..ba8c027381 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -12,7 +12,7 @@ #include #include "CFBundle_Internal.h" -#if DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if TARGET_OS_IPHONE #include #endif @@ -58,7 +58,7 @@ // See static Boolean _binaryLoadable(CFURLRef url) { Boolean loadable = _CFURLExists(url); -#if DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if TARGET_OS_IPHONE if (!loadable) { uint8_t path[PATH_MAX]; if (url && CFURLGetFileSystemRepresentation(url, true, path, sizeof(path))) { @@ -89,7 +89,7 @@ static CFURLRef _CFBundleCopyExecutableURLRaw(CFURLRef urlPath, CFStringRef exeN } } } -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE const uint8_t *image_suffix = (uint8_t *)__CFgetenvIfNotRestricted("DYLD_IMAGE_SUFFIX"); if (image_suffix) { diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index 825d43e0ab..c465a5de3e 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -25,7 +25,7 @@ #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #if !TARGET_OS_ANDROID #include @@ -288,7 +288,7 @@ CF_EXPORT CFArrayRef _CFBundleGetSupportedPlatforms(CFBundleRef bundle) { CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { #if DEPLOYMENT_TARGET_MACOSX return CFSTR("MacOS"); -#elif DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif TARGET_OS_IPHONE return CFSTR("iPhoneOS"); #elif DEPLOYMENT_TARGET_WINDOWS return CFSTR("Windows"); @@ -310,7 +310,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { } CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE return CFSTR("MacOS"); #elif DEPLOYMENT_TARGET_WINDOWS return CFSTR("Windows"); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c index 00d274bcd2..076865a8c3 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c @@ -178,7 +178,7 @@ CF_EXPORT CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } _CFMutexLock(&CFBundleGlobalDataLock); result = _CFBundlePrimitiveGetBundleWithIdentifierAlreadyLocked(bundleID); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index 09d5956922..175d92e48e 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -81,7 +81,7 @@ typedef HANDLE dispatch_runloop_handle_t; #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_SIMULATOR +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_SIMULATOR #include #include #include @@ -225,7 +225,7 @@ static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; // In order to reuse most of the code across Mach and Windows v1 RunLoopSources, we define a // simple abstraction layer spanning Mach ports and Windows HANDLES -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE uint32_t __CFGetProcessPortCount(void) { ipc_info_space_t info; @@ -552,7 +552,7 @@ typedef struct UnsignedWide { typedef UnsignedWide AbsoluteTime; #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #if USE_DISPATCH_SOURCE_FOR_TIMERS #endif @@ -1951,7 +1951,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__(void (*pe } static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE void *(*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info), mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply, #else @@ -1960,7 +1960,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( void *info) __attribute__((noinline)); static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE void *(*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info), mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply, #else @@ -1968,7 +1968,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( #endif void *info) { if (perform) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE *reply = perform(msg, size, kCFAllocatorSystemDefault, info); #else perform(info); @@ -2053,7 +2053,7 @@ CF_INLINE void __CFRunLoopDebugInfoForRunLoopSource(CFRunLoopSourceRef rls) { } // msg, size and reply are unused on Windows -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) __attribute__((noinline)); static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) @@ -2079,7 +2079,7 @@ static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRun void *info = rls->_context.version1.info; cf_trace(KDEBUG_EVENT_CFRL_IS_CALLING_SOURCE1 | DBG_FUNC_START, rl, rlm, perform, info); __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__(perform, -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE msg, size, reply, #endif info); @@ -2450,7 +2450,7 @@ CF_EXPORT Boolean _CFRunLoopFinished(CFRunLoopRef rl, CFStringRef modeName) { static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInterval seconds, Boolean stopAfterHandle, CFRunLoopModeRef previousMode) __attribute__((noinline)); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define TIMEOUT_INFINITY (~(mach_msg_timeout_t)0) @@ -2742,12 +2742,12 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter Boolean didDispatchPortLastTime = true; int32_t retVal = 0; do { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE voucher_mach_msg_state_t voucherState = VOUCHER_MACH_MSG_STATE_UNCHANGED; voucher_t voucherCopy = NULL; #endif uint8_t msg_buffer[3 * 1024]; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE mach_msg_header_t *msg = NULL; mach_port_t livePort = MACH_PORT_NULL; #elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN @@ -2779,7 +2779,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #if __HAS_DISPATCH__ if (MACH_PORT_NULL != dispatchPort && !didDispatchPortLastTime) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE msg = (mach_msg_header_t *)msg_buffer; if (__CFRunLoopServiceMachPort(dispatchPort, &msg, sizeof(msg_buffer), &livePort, 0, &voucherState, NULL, rl, rlm)) { goto handle_msg; @@ -2814,7 +2814,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter CFAbsoluteTime sleepStart = poll ? 0.0 : CFAbsoluteTimeGetCurrent(); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #if USE_DISPATCH_SOURCE_FOR_TIMERS do { msg = (mach_msg_header_t *)msg_buffer; @@ -2974,7 +2974,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter // Despite the name, this works for windows handles as well CFRunLoopSourceRef rls = __CFRunLoopModeFindSourceForMachPort(rl, rlm, livePort); if (rls) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE mach_msg_header_t *reply = NULL; sourceHandledThisLoop = __CFRunLoopDoSource1(rl, rlm, rls, msg, msg->msgh_size, &reply) || sourceHandledThisLoop; if (NULL != reply) { @@ -2992,7 +2992,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter /* --- BLOCKS --- */ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (msg && msg != (mach_msg_header_t *)msg_buffer) free(msg); #endif @@ -3114,7 +3114,7 @@ void CFRunLoopWakeUp(CFRunLoopRef rl) { __CFRunLoopUnlock(rl); return; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE kern_return_t ret; /* We unconditionally try to send the message, since we don't want * to lose a wakeup, but the send may fail if there is already a @@ -3717,7 +3717,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL void *addr = rls->_context.version0.version == 0 ? (void *)rls->_context.version0.perform : (rls->_context.version0.version == 1 ? (void *)rls->_context.version1.perform : NULL); #if DEPLOYMENT_TARGET_WINDOWS contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %p}"), rls->_context.version0.version, rls->_context.version0.info, addr); -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %s (%p)}"), rls->_context.version0.version, rls->_context.version0.info, name, addr); @@ -3916,7 +3916,7 @@ static CFStringRef __CFRunLoopObserverCopyDescription(CFTypeRef cf) { /* DOES CA } #if DEPLOYMENT_TARGET_WINDOWS result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{valid = %s, activities = 0x%x, repeats = %s, order = %d, callout = %p, context = %@}"), cf, CFGetAllocator(rlo), __CFIsValid(rlo) ? "Yes" : "No", rlo->_activities, __CFRunLoopObserverRepeats(rlo) ? "Yes" : "No", rlo->_order, rlo->_callout, contextDesc); -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) void *addr = rlo->_callout; Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; @@ -4370,7 +4370,7 @@ void CFRunLoopTimerGetContext(CFRunLoopTimerRef rlt, CFRunLoopTimerContext *cont } CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), CFTimeInterval, (NSTimer *)rlt, tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); @@ -4381,7 +4381,7 @@ CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { } void CFRunLoopTimerSetTolerance(CFRunLoopTimerRef rlt, CFTimeInterval tolerance) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), void, (NSTimer *)rlt, setTolerance:tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index b7093ddbdd..45a84aeb14 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -937,7 +937,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #include #include @@ -1117,7 +1117,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define INVALID_SOCKET (CFSocketNativeHandle)(-1) #define closesocket(a) close((a)) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) @@ -1349,7 +1349,7 @@ CF_INLINE Boolean __CFSocketFdClr(CFSocketNativeHandle sock, CFMutableDataRef fd } static SInt32 __CFSocketCreateWakeupSocketPair(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE SInt32 error; error = socketpair(PF_LOCAL, SOCK_DGRAM, 0, __CFWakeupSocketPair); @@ -2447,7 +2447,7 @@ static CFStringRef __CFSocketCopyDescription(CFTypeRef cf) { result = CFStringCreateMutable(CFGetAllocator(s), 0); __CFSocketLock(s); void *addr = s->_callout; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; #else @@ -2508,7 +2508,7 @@ const CFRuntimeClass __CFSocketClass = { CFTypeID CFSocketGetTypeID(void) { static dispatch_once_t initOnce; dispatch_once(&initOnce, ^{ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE struct rlimit lim1; int ret1 = getrlimit(RLIMIT_NOFILE, &lim1); int mib[] = {CTL_KERN, KERN_MAXFILESPERPROC}; @@ -2615,13 +2615,13 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN if (INVALID_SOCKET != sock) CFDictionaryAddValue(__CFAllSockets, (void *)(uintptr_t)sock, memory); if (NULL == __CFSocketManagerThread) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD _CFThreadRef tid = 0; pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif pthread_create(&tid, &attr, __CFSocketManager, 0); @@ -3269,7 +3269,7 @@ CFSocketError CFSocketSetAddress(CFSocketRef s, CFDataRef address) { if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // Verify that the namelen is correct. If not, we have to fix it up. Developers will often incorrectly use 0 or strlen(path). See 9217961 and the second half of 9098274. // Max size is a size byte, plus family byte, plus path of 255, plus a null byte. char newName[255]; @@ -3321,7 +3321,7 @@ CFSocketError CFSocketConnectToAddress(CFSocketRef s, CFDataRef address, CFTimeI if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE SInt32 flags = fcntl(sock, F_GETFL, 0); if (flags >= 0) wasBlocking = ((flags & O_NONBLOCK) == 0); if (wasBlocking && (timeout > 0.0 || timeout < 0.0)) ioctlsocket(sock, FIONBIO, (u_long *)&yes); @@ -3383,7 +3383,7 @@ CFSocketRef CFSocketCreate(CFAllocatorRef allocator, SInt32 protocolFamily, SInt if (0 >= protocol && SOCK_STREAM == socketType) protocol = IPPROTO_TCP; if (0 >= protocol && SOCK_DGRAM == socketType) protocol = IPPROTO_UDP; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (PF_LOCAL == protocolFamily && 0 >= socketType) socketType = SOCK_STREAM; #endif #if DEPLOYMENT_TARGET_WINDOWS @@ -3470,7 +3470,7 @@ static void __CFSocketSendNameRegistryRequest(CFSocketSignature *signature, CFDi static void __CFSocketValidateSignature(const CFSocketSignature *providedSignature, CFSocketSignature *signature, uint16_t defaultPortNumber) { struct sockaddr_in sain, *sainp; memset(&sain, 0, sizeof(sain)); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; @@ -3496,7 +3496,7 @@ static void __CFSocketValidateSignature(const CFSocketSignature *providedSignatu } else { sainp = (struct sockaddr_in *)CFDataGetBytePtr(providedSignature->address); if ((int)sizeof(struct sockaddr_in) <= CFDataGetLength(providedSignature->address) && (AF_INET == sainp->sin_family || 0 == sainp->sin_family)) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; diff --git a/CoreFoundation/Stream.subproj/CFConcreteStreams.c b/CoreFoundation/Stream.subproj/CFConcreteStreams.c index f5892d1490..0a80d52ab5 100644 --- a/CoreFoundation/Stream.subproj/CFConcreteStreams.c +++ b/CoreFoundation/Stream.subproj/CFConcreteStreams.c @@ -18,7 +18,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #include #endif @@ -49,7 +49,7 @@ typedef struct { CONST_STRING_DECL(kCFStreamPropertyFileCurrentOffset, "kCFStreamPropertyFileCurrentOffset"); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CONST_STRING_DECL(_kCFStreamPropertyFileNativeHandle, "_kCFStreamPropertyFileNativeHandle"); #endif CONST_STRING_DECL(_kCFStreamPropertyHTTPTrailer, "_kCFStreamPropertyHTTPTrailer"); @@ -442,7 +442,7 @@ static CFTypeRef fileCopyProperty(struct _CFStream *stream, CFStringRef property if (fileStream->offset != -1) { result = CFNumberCreate(CFGetAllocator((CFTypeRef)stream), kCFNumberSInt64Type, &(fileStream->offset)); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE } else if (CFEqual(propertyName, _kCFStreamPropertyFileNativeHandle)) { int fd = fileStream->fd; if (fd != -1) { diff --git a/CoreFoundation/String.subproj/CFBurstTrie.c b/CoreFoundation/String.subproj/CFBurstTrie.c index ad65747759..6ea9071557 100644 --- a/CoreFoundation/String.subproj/CFBurstTrie.c +++ b/CoreFoundation/String.subproj/CFBurstTrie.c @@ -18,7 +18,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #include #include diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index 8d93691a54..3ba7efe54d 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -27,7 +27,7 @@ #include "CFString_Internal.h" #include "CFRuntime_Internal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include "CFLocaleInternal.h" #include "CFStringLocalizedFormattingInternal.h" #endif @@ -103,7 +103,7 @@ static void __CFRecordStringAllocationEvent(const char *encoding, const char *by } #endif //INSTRUMENT_SHARED_STRINGS -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE extern size_t malloc_good_size(size_t size); #endif extern void __CFStrConvertBytesToUnicode(const uint8_t *bytes, UniChar *buffer, CFIndex numChars); @@ -414,7 +414,7 @@ static CFStringEncoding __CFDefaultFileSystemEncoding = kCFStringEncodingInvalid CFStringEncoding __CFDefaultEightBitStringEncoding = kCFStringEncodingInvalidId; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define __defaultEncoding kCFStringEncodingMacRoman #elif DEPLOYMENT_TARGET_LINUX #define __defaultEncoding kCFStringEncodingUTF8 @@ -443,7 +443,7 @@ CF_INLINE CFStringEncoding __CFStringGetSystemEncoding(void) { CFStringEncoding CFStringFileSystemEncoding(void) { if (__CFDefaultFileSystemEncoding == kCFStringEncodingInvalidId) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS __CFDefaultFileSystemEncoding = kCFStringEncodingUTF8; #else __CFDefaultFileSystemEncoding = CFStringGetSystemEncoding(); @@ -645,7 +645,7 @@ CF_INLINE CFIndex __CFStrNewCapacity(CFMutableStringRef str, unsigned long reqCa } if (__CFStrHasContentsAllocator(str)) { /* Also apply any preferred size from the allocator */ newCapacity = CFAllocatorGetPreferredSizeForSize(__CFStrContentsAllocator(str), newCapacity, 0); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE } else { newCapacity = malloc_good_size(newCapacity); #endif @@ -4657,7 +4657,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (((encoding & 0x0FFF) == kCFStringEncodingUnicode) && ((encoding == kCFStringEncodingUnicode) || ((encoding > kCFStringEncodingUTF8) && (encoding <= kCFStringEncodingUTF32LE)))) { guessedByteLength = (length + 1) * ((((encoding >> 26) & 2) == 0) ? sizeof(UTF16Char) : sizeof(UTF32Char)); // UTF32 format has the bit set } else if (((guessedByteLength = CFStringGetMaximumSizeForEncoding(length, encoding)) > length) && !CF_IS_OBJC(_kCFRuntimeIDCFString, string) && !CF_IS_SWIFT(_kCFRuntimeIDCFString, string)) { // Multi byte encoding -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (__CFStrIsUnicode(string)) { CFIndex aLength = CFStringEncodingByteLengthForCharacters(encoding, kCFStringEncodingPrependBOM, __CFStrContents(string), __CFStrLength(string)); if (aLength > 0) guessedByteLength = aLength; @@ -4671,7 +4671,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (guessedByteLength == length && __CFStrIsEightBit(string) && __CFStringEncodingIsSupersetOfASCII(encoding)) { // It's all ASCII !! return CFDataCreate(alloc, ((uint8_t *)__CFStrContents(string) + __CFStrSkipAnyLengthByte(string)), __CFStrLength(string)); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } #endif } @@ -6500,7 +6500,7 @@ reswtch:switch (ch) { // Length of the buffer to call sprintf() with #define BUFFER_LEN 512 -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define SNPRINTF(TYPE, WHAT) { \ TYPE value = (TYPE) WHAT; \ if (-1 != specs[curSpec].widthArgNum) { \ @@ -7186,7 +7186,7 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr } // See if we need to localize the decimal point if (formatOptions) { // We have localization info -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringRef decimalSeparator = (CFGetTypeID(formatOptions) == CFLocaleGetTypeID()) ? (CFStringRef)CFLocaleGetValue((CFLocaleRef)formatOptions, kCFLocaleDecimalSeparatorKey) : (CFStringRef)CFDictionaryGetValue(formatOptions, CFSTR("NSDecimalSeparator")); #else CFStringRef decimalSeparator = CFSTR("."); diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index c277929bbb..7d86c3fc5e 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -599,7 +599,7 @@ static const _CFEncodingConverter *__CFGetConverter(uint32_t encoding) { case kCFStringEncodingUTF8: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[0]); break; /* the swith here should avoid possible bootstrap issues in the default: case below when invoked from CFStringGetSystemEncoding() */ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX case kCFStringEncodingMacRoman: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[1]); break; #elif DEPLOYMENT_TARGET_WINDOWS case kCFStringEncodingWindowsLatin1: commonConverterSlot = (const _CFEncodingConverter **)(&(commonConverters[1])); break; diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index b7540374a8..9f1ab82050 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -15,7 +15,7 @@ #include "CFStringEncodingConverterExt.h" #include "CFUnicodeDecomposition.h" #include "CFUniCharPriv.h" -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -107,7 +107,7 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, // Memory map the file -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { @@ -171,7 +171,7 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { #elif DEPLOYMENT_TARGET_WINDOWS static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { @@ -238,7 +238,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #endif // USE_MACHO_SEGMENT -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if !defined(CF_UNICHAR_BITMAP_FILE) #if USE_MACHO_SEGMENT #define CF_UNICHAR_BITMAP_FILE "__csbitmaps" @@ -254,7 +254,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -286,7 +286,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -308,7 +308,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICODE_DATA_SYM __CFUnicodeDataL #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_MACHO_SEGMENT *bytes = __CFGetSectDataPtr("__UNICODE", bitmapName, NULL); diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index c8cbef0ef8..5fea679b02 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -20,7 +20,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #if DEPLOYMENT_TARGET_MACOSX #include #endif @@ -2262,7 +2262,7 @@ static CFURLRef _CFURLCreateWithFileSystemRepresentation(CFAllocatorRef allocato #endif struct __CFURL *result = NULL; if (bufLen > 0) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX Boolean isAbsolute = bufLen && (*buffer == '/'); Boolean addedPercentEncoding; Boolean releaseBaseURL = false; @@ -4045,7 +4045,7 @@ static CFStringRef URLPathToPOSIXPath(CFStringRef path, CFAllocatorRef allocator return result; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str, UInt8 *inBuffer, CFIndex inBufferLen) { size_t fileURLPrefixLength; @@ -4371,7 +4371,7 @@ CF_EXPORT CFStringRef CFURLCopyFileSystemPath(CFURLRef anURL, CFURLPathStyle pat CFStringRef result = NULL; CFAllocatorRef alloc = CFGetAllocator(anURL); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX Boolean isCanonicalFileURL = false; if ( (pathStyle == kCFURLPOSIXPathStyle) && (CFURLGetBaseURL(anURL) == NULL) ) { @@ -4515,13 +4515,13 @@ CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLR } Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, uint8_t *buffer, CFIndex bufLen) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS CFAllocatorRef alloc = CFGetAllocator(url); CFStringRef path; if (!url) return false; #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX if ( !resolveAgainstBase || (CFURLGetBaseURL(url) == NULL) ) { if (!CF_IS_OBJC(CFURLGetTypeID(), url)) { // We can access the ivars diff --git a/CoreFoundation/URL.subproj/CFURL.inc.h b/CoreFoundation/URL.subproj/CFURL.inc.h index 78e4ed5652..fdcc41fea1 100644 --- a/CoreFoundation/URL.subproj/CFURL.inc.h +++ b/CoreFoundation/URL.subproj/CFURL.inc.h @@ -244,7 +244,7 @@ break; } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (pathRg.length > 6 && characterArray[pathRg.location] == '/' && characterArray[pathRg.location + 1] == '.' && characterArray[pathRg.location + 2] == 'f' && characterArray[pathRg.location + 3] == 'i' && characterArray[pathRg.location + 4] == 'l' && characterArray[pathRg.location + 5] == 'e' && characterArray[pathRg.location + 6] == '/') { flags |= PATH_HAS_FILE_ID; } else if (!sawPercent) { diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index a1e0ec8277..b34fe161ec 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -24,7 +24,7 @@ CFData read/write routines #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -41,7 +41,7 @@ CFData read/write routines #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS #include #endif @@ -233,7 +233,7 @@ static Boolean _CFFileURLWritePropertiesToResource(CFURLRef url, CFDictionaryRef CFNumberRef modeNum = (CFNumberRef)value; CFNumberGetValue(modeNum, kCFNumberSInt32Type, &mode); } else { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define MODE_TYPE mode_t #elif DEPLOYMENT_TARGET_WINDOWS #define MODE_TYPE uint16_t From e0cd4eaaec846cc10a19c888552611133576ab4c Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 09:35:43 -0700 Subject: [PATCH 03/10] Erase DEPLOYMENT_TARGET_EMBEDDED_MINI --- CoreFoundation/Base.subproj/CFRuntime.c | 2 +- CoreFoundation/Base.subproj/CFUtilities.c | 9 +-------- CoreFoundation/Locale.subproj/CFLocale.c | 12 ------------ CoreFoundation/StringEncodings.subproj/CFUniChar.c | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 7596a4ced2..c344e3e42d 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -268,7 +268,7 @@ bool (*__CFObjCIsCollectable)(void *) = NULL; // The constant string class reference is set at link time to _NSCFConstantString void *__CFConstantStringClassReferencePtr = &_CF_CONSTANT_STRING_SWIFT_CLASS; #else -#if !__CONSTANT_CFSTRINGS__ || DEPLOYMENT_TARGET_EMBEDDED_MINI +#if !__CONSTANT_CFSTRINGS__ // Compiler uses this symbol name; must match compiler built-in decl, so we use 'int' #if TARGET_RT_64_BIT int __CFConstantStringClassReference[24] = {0}; diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index c527d0325b..4f90069c54 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -264,19 +264,12 @@ static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) { if (url) CFRelease(url); if (plist) { -#if DEPLOYMENT_TARGET_EMBEDDED_MINI - CFStringRef fullVersion, vers, versExtra, build; - CFStringRef versionString = CFRetain(_kCFSystemVersionProductVersionStringKey); - CFStringRef buildString = CFRetain(_kCFSystemVersionBuildStringKey); - CFStringRef fullVersionString = CFRetain(CFSTR("FullVersionString")); -#else CFBundleRef locBundle = NULL; CFStringRef fullVersion, vers, versExtra, build; CFStringRef versionString = _CFCopyLocalizedVersionKey(&locBundle, _kCFSystemVersionProductVersionStringKey); CFStringRef buildString = _CFCopyLocalizedVersionKey(&locBundle, _kCFSystemVersionBuildStringKey); CFStringRef fullVersionString = _CFCopyLocalizedVersionKey(&locBundle, CFSTR("FullVersionString")); if (locBundle) CFRelease(locBundle); -#endif // Now build the full version string if (CFEqual(fullVersionString, CFSTR("FullVersionString"))) { @@ -719,7 +712,7 @@ typedef enum { static bool also_do_stderr(const _cf_logging_style style) { bool result = false; -#if DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_LINUX // just log to stderr, other logging facilities are out result = true; #elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index fde6501b73..8c20d50b0a 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -52,18 +52,6 @@ uameasfmt_getUnitsForUsage( const char* locale, #include #include -#if DEPLOYMENT_TARGET_EMBEDDED_MINI -// Some compatibility definitions -#define ULOC_FULLNAME_CAPACITY 157 -#define ULOC_KEYWORD_AND_VALUES_CAPACITY 100 - -//typedef long UErrorCode; -//#define U_BUFFER_OVERFLOW_ERROR 15 -//#define U_ZERO_ERROR 0 -// -//typedef uint16_t UChar; -#endif - #if DEPLOYMENT_TARGET_EMBEDDED #include #endif diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index 9f1ab82050..e601d8d20c 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -34,7 +34,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED #define __kCFCharacterSetDir "/System/Library/CoreServices" -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_EMBEDDED_MINI +#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" #elif DEPLOYMENT_TARGET_WINDOWS #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" From 1fa7df4b77a5edf8886c03a22f8d3d32b24ce63d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 09:46:43 -0700 Subject: [PATCH 04/10] DEPLOYMENT_TARGET_EMBEDDED -> TARGET_OS_IPHONE --- CoreFoundation/Base.subproj/CFInternal.h | 8 +- CoreFoundation/Base.subproj/CFPlatform.c | 2 +- CoreFoundation/Base.subproj/CFRuntime.c | 10 +- .../Base.subproj/CFSystemDirectories.c | 4 +- CoreFoundation/Base.subproj/CFUUID.c | 2 +- CoreFoundation/Base.subproj/CFUtilities.c | 16 ++-- .../Base.subproj/CoreFoundation_Prefix.h | 2 +- .../Base.subproj/ForFoundationOnly.h | 8 +- .../Collections.subproj/CFBasicHash.c | 2 +- .../Collections.subproj/CFStorage.c | 2 +- CoreFoundation/Error.subproj/CFError.c | 14 +-- CoreFoundation/Locale.subproj/CFLocale.c | 94 +++++++++---------- .../Locale.subproj/CFLocaleIdentifier.c | 18 ++-- CoreFoundation/NumberDate.subproj/CFDate.c | 14 +-- .../Parsing.subproj/CFPropertyList.c | 2 +- .../PlugIn.subproj/CFBundle_Binary.c | 4 +- .../PlugIn.subproj/CFBundle_Executable.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle_Grok.c | 2 +- .../PlugIn.subproj/CFBundle_Resources.c | 2 +- .../CFApplicationPreferences.c | 2 +- .../RunLoop.subproj/CFMessagePort.c | 2 +- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 2 +- CoreFoundation/RunLoop.subproj/CFSocket.c | 2 +- .../Stream.subproj/CFSocketStream.c | 6 +- CoreFoundation/Stream.subproj/CFStream.c | 2 +- CoreFoundation/String.subproj/CFString.c | 4 +- .../String.subproj/CFStringEncodings.c | 4 +- .../String.subproj/CFStringTransform.c | 2 +- .../String.subproj/CFStringUtilities.c | 24 ++--- .../StringEncodings.subproj/CFICUConverters.c | 2 +- .../CFPlatformConverters.c | 6 +- .../CFStringEncodingConverter.c | 12 +-- .../StringEncodings.subproj/CFUniChar.c | 10 +- CoreFoundation/URL.subproj/CFURL.c | 28 +++--- CoreFoundation/URL.subproj/CFURLAccess.c | 8 +- Docs/Design.md | 2 +- 36 files changed, 163 insertions(+), 163 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index c336c1de2d..6825a1df73 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -421,7 +421,7 @@ CF_PRIVATE Boolean __CFProcessIsRestricted(void); // Be sure to call this before your SAFE_STACK_BUFFER exits scope. #define SAFE_STACK_BUFFER_CLEANUP(Name) if (__ ## Name ## WasMallocd) free(Name) -#endif // DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#endif // !DEPLOYMENT_TARGET_WINDOWS CF_EXPORT void * __CFConstantStringClassReferencePtr; @@ -856,7 +856,7 @@ CF_INLINE uintptr_t __CFISAForTypeID(CFTypeID typeID) { // DEFINE_WEAK_CARBONCORE_FUNC(void, DisposeHandle, (Handle h), (h)) // -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE extern void *__CFLookupCFNetworkFunction(const char *name); @@ -881,7 +881,7 @@ extern void *__CFLookupCFNetworkFunction(const char *name); #define DEFINE_WEAK_CARBONCORE_FUNC(R, N, P, A, ...) -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE extern void *__CFLookupCoreServicesInternalFunction(const char *name); @@ -1083,7 +1083,7 @@ CF_PRIVATE uint8_t *_CFDataGetBytePtrNonObjC(CFDataRef data); #pragma mark - #pragma mark CF Instruments SPI -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE extern void __CFRecordAllocationEvent(int eventnum, void *ptr, int64_t size, uint64_t data, const char *classname); #else #define __CFRecordAllocationEvent(a, b, c, d, e) ((void)0) diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index 038658a848..f06efab6da 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -1498,7 +1498,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { } CF_EXPORT char **_CFEnviron(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE return *_NSGetEnviron(); #elif DEPLOYMENT_TARGET_WINDOWS return _environ; diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index c344e3e42d..43e3ee238c 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -33,7 +33,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_EMBEDDED +#if TARGET_OS_IPHONE // This isn't in the embedded runtime.h header OBJC_EXPORT void *objc_destructInstance(id obj); #endif @@ -60,7 +60,7 @@ __kCFReleaseEvent = 29 #define FAKE_INSTRUMENTS 0 -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE void __CFOAInitializeNSObject(void); // from NSObject.m bool __CFOASafe = false; @@ -404,7 +404,7 @@ CF_INLINE uint32_t __CFHighRCFromInfo(__CFInfoType info) { CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const char *className) { CFRuntimeBase *memory; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE memory = malloc_zone_memalign(malloc_default_zone(), align, size); #elif DEPLOYMENT_TARGET_LINUX int result = posix_memalign((void **)&memory, /*alignment*/ align, size); @@ -1162,7 +1162,7 @@ void __CFInitialize(void) { #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE { CFIndex idx, cnt; char **args = *_NSGetArgv(); @@ -1256,7 +1256,7 @@ void __CFInitialize(void) { if (value && (*value == 'Y' || *value == 'y')) __CFDeallocateZombies = 0xff; #endif -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) +#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) CFLog(kCFLogLevelWarning, CFSTR("Assertions enabled")); #endif diff --git a/CoreFoundation/Base.subproj/CFSystemDirectories.c b/CoreFoundation/Base.subproj/CFSystemDirectories.c index f36b2ee6fb..25e3ddd90c 100644 --- a/CoreFoundation/Base.subproj/CFSystemDirectories.c +++ b/CoreFoundation/Base.subproj/CFSystemDirectories.c @@ -18,7 +18,7 @@ #include #include "CFInternal.h" -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE /* We use the System framework implementation on Mach. */ @@ -52,7 +52,7 @@ CFSearchPathEnumerationState __CFGetNextSearchPathEnumeration(CFSearchPathEnumer #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde) { CFMutableArrayRef array; diff --git a/CoreFoundation/Base.subproj/CFUUID.c b/CoreFoundation/Base.subproj/CFUUID.c index 80f2badfe2..c002f00254 100644 --- a/CoreFoundation/Base.subproj/CFUUID.c +++ b/CoreFoundation/Base.subproj/CFUUID.c @@ -151,7 +151,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) { long rStatus = UuidCreate(&u); if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1; memmove(&bytes, &u, sizeof(bytes)); -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX static Boolean useV1UUIDs = false, checked = false; uuid_t uuid; if (!checked) { diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index 4f90069c54..fea8821e6b 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -14,7 +14,7 @@ #include "CFLocaleInternal.h" #include "CFBundle_Internal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #include #endif #include @@ -29,7 +29,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #else #define ASL_LEVEL_EMERG 0 @@ -225,7 +225,7 @@ static CFStringRef copySystemVersionPath(CFStringRef suffix) { // Looks for localized version of "nonLocalized" in the SystemVersion bundle // If not found, and returnNonLocalizedFlag == true, will return the non localized string (retained of course), otherwise NULL // If bundlePtr != NULL, will use *bundlePtr and will return the bundle in there; otherwise bundle is created and released -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRef nonLocalized) { CFStringRef localized = NULL; CFBundleRef locBundle = bundlePtr ? *bundlePtr : NULL; @@ -392,7 +392,7 @@ CF_PRIVATE void *__CFLookupCarbonCoreFunction(const char *name) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE void *__CFLookupCoreServicesInternalFunction(const char *name) { static void *image = NULL; static dispatch_once_t onceToken; @@ -692,7 +692,7 @@ void CFShow(const void *obj) { // message must be a UTF8-encoded, null-terminated, byte buffer with at least length bytes typedef void (*CFLogFunc)(int32_t lev, const char *message, size_t length, char withBanner); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static Boolean debugger_attached() { BOOL debuggerAttached = NO; struct proc_bsdshortinfo info; @@ -715,7 +715,7 @@ static bool also_do_stderr(const _cf_logging_style style) { #if DEPLOYMENT_TARGET_LINUX // just log to stderr, other logging facilities are out result = true; -#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (style == _cf_logging_style_os_log) { // // This might seem a bit odd, so an explanation is in order: @@ -889,7 +889,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length _populateBanner(&banner, &time, &thread, &bannerLen); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" uid_t euid; @@ -1037,7 +1037,7 @@ void CFLog1(CFLogLevel lev, CFStringRef message) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE kern_return_t _CFDiscorporateMemoryAllocate(CFDiscorporateMemory *hm, size_t size, bool purgeable) { kern_return_t ret = KERN_SUCCESS; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index 749696d6a2..dfb2e0f405 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -45,7 +45,7 @@ extern "C" { #define pthread_set_qos_class_self_np(A, B) do {} while (0) #define pthread_override_qos_class_start_np(A, B, C) (NULL) #define pthread_override_qos_class_end_np(A) do {} while (0) -#elif (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) +#elif (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) #include #include #endif diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index dae697340a..2a88e4d305 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -55,7 +55,7 @@ CF_IMPLICIT_BRIDGING_DISABLED #include #endif -#if (INCLUDE_OBJC || DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT +#if (INCLUDE_OBJC || DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT #include #endif @@ -465,7 +465,7 @@ CF_EXPORT const void *_CFArrayCheckAndGetValueAtIndex(CFArrayRef array, CFIndex CF_EXPORT void _CFArrayReplaceValues(CFMutableArrayRef array, CFRange range, const void *_Nullable * _Nullable newValues, CFIndex newCount); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE /* Enumeration Call CFStartSearchPathEnumeration() once, then call CFGetNextSearchPathEnumeration() one or more times with the returned state. @@ -545,7 +545,7 @@ CF_EXPORT Boolean _CFRunLoopIsCurrent(CFRunLoopRef rl); CF_EXPORT CFIndex _CFStreamInstanceSize(void); CF_EXPORT CFReadStreamRef CFReadStreamCreateWithData(_Nullable CFAllocatorRef alloc, CFDataRef data); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE typedef struct { mach_vm_address_t address; mach_vm_size_t size; @@ -586,7 +586,7 @@ CF_INLINE UInt64 __CFReadTSR(void) { #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE /* Identical to CFStringGetFileSystemRepresentation, but returns additional information about the failure. */ diff --git a/CoreFoundation/Collections.subproj/CFBasicHash.c b/CoreFoundation/Collections.subproj/CFBasicHash.c index fdf9ffdc1d..20d2097f8b 100644 --- a/CoreFoundation/Collections.subproj/CFBasicHash.c +++ b/CoreFoundation/Collections.subproj/CFBasicHash.c @@ -20,7 +20,7 @@ #endif #include "CFOverflow.h" -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define __SetLastAllocationEventName(A, B) do { if (__CFOASafe && (A)) __CFSetLastAllocationEventName(A, B); } while (0) #else #define __SetLastAllocationEventName(A, B) do { } while (0) diff --git a/CoreFoundation/Collections.subproj/CFStorage.c b/CoreFoundation/Collections.subproj/CFStorage.c index fe0364199b..07287e5bd0 100644 --- a/CoreFoundation/Collections.subproj/CFStorage.c +++ b/CoreFoundation/Collections.subproj/CFStorage.c @@ -1091,7 +1091,7 @@ CFStorageRef CFStorageCreate(CFAllocatorRef allocator, CFIndex valueSize) { storage->valueSize = valueSize; /* if valueSize is a power of 2, then set the shifter to the log base 2 of valueSize. Otherwise set it to NO_SHIFTER */ if (valueSize > 0 && !(valueSize & (valueSize - 1))) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE storage->byteToValueShifter = __builtin_ctzl(valueSize); #else CFIndex tempSize = valueSize; diff --git a/CoreFoundation/Error.subproj/CFError.c b/CoreFoundation/Error.subproj/CFError.c index 6bdc71815d..8a2f10de4a 100644 --- a/CoreFoundation/Error.subproj/CFError.c +++ b/CoreFoundation/Error.subproj/CFError.c @@ -14,7 +14,7 @@ #include "CFRuntime_Internal.h" #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #endif @@ -250,7 +250,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { if (reason) { CFStringRef const backstopComboString = CFSTR("%@ %@"); CFStringRef comboString = backstopComboString; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (cfBundle) comboString = CFCopyLocalizedStringFromTableInBundle(CFSTR("%@ %@"), CFSTR("Error"), cfBundle, "Used for presenting the 'what failed' and 'why it failed' sections of an error message, where each one is one or more complete sentences. The first %@ corresponds to the 'what failed' (For instance 'The file could not be saved.') and the second one 'why it failed' (For instance 'The volume is out of space.')"); #endif @@ -265,7 +265,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS // Cache the CF bundle since we will be using it for localized strings. Note that for platforms without bundle support we also go this non-localized route. CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (!cfBundle) { // This should be rare, but has been observed in the wild, due to running out of file descriptors. Normally we might not go to such extremes, but since we want to be able to present reasonable errors even in the case of errors such as running out of file descriptors, why not. This is CFError after all. !!! Be sure to have the same logic here as below for going through various options for fetching the strings. @@ -281,7 +281,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } if (reasonOrDesc) CFRelease(reasonOrDesc); return result; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS } // Then look for kCFErrorLocalizedFailureReasonKey; if there, create a full sentence from that. @@ -495,7 +495,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR if (!errStr) return NULL; if (CFEqual(key, kCFErrorDescriptionKey)) return errStr; // If all we wanted was the non-localized description, we're done -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // We need a kCFErrorLocalizedFailureReasonKey, so look up a possible localization for the error message // Look for the bundle in /System/Library/CoreServices/CoreTypes.bundle CFArrayRef paths = CFCopySearchPathForDirectoriesInDomains(kCFLibraryDirectory, kCFSystemDomainMask, false); @@ -534,7 +534,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR return errStr; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE /* Built-in callback for Mach domain. */ static CFTypeRef _CFErrorMachCallBack(CFErrorRef err, CFStringRef key) CF_RETURNS_RETAINED { @@ -565,7 +565,7 @@ static void _CFErrorInitializeCallBackTable(void) { _CFErrorCallBackTable = table; // Register the known providers, going thru a special variant of the function that doesn't lock __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainPOSIX, _CFErrorPOSIXCallBack); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainMach, _CFErrorMachCallBack); #endif __CFUnlock(&_CFErrorSpinlock); diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index 8c20d50b0a..82bdce4167 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include @@ -52,7 +52,7 @@ uameasfmt_getUnitsForUsage( const char* locale, #include #include -#if DEPLOYMENT_TARGET_EMBEDDED +#if TARGET_OS_IPHONE #include #endif @@ -298,7 +298,7 @@ static void _setCachedCurrentLocale(CFLocaleRef newLocale) { #define FALLBACK_LOCALE_NAME CFSTR("en_US") #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFStringRef _CFLocaleCopyLocaleIdentifierByAddingLikelySubtags(CFStringRef localeID) { CFStringRef result = NULL; @@ -526,7 +526,7 @@ CFStringRef _CFLocaleCreateLocaleIdentiferByReplacingLanguageCodeAndScriptCode(C } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray); /// Creates a new locale identifier by identifying the most preferred localization (using `availableLocalizations` and `preferredLanguages`) and then creating a locale based on the most preferred localization, while retaining any relevant attributes from `preferredLocaleID`, e.g. if `availableLocalizations` is `[ "en", "fr", "de" ]`, `preferredLanguages` is `[ "ar-AE", "en-AE" ]`, `preferredLocaleID` is `ar_AE@numbers=arab;calendar=islamic-civil`, it will return `en_AE@calendar=islamic-civil`, i.e. the language will be matched to `en` since that’s the only available localization that matches, `calendar` will be retained since it’s language-agnostic, but `numbers` will be discarded because the `arab` numbering system is not valid for `en`. @@ -585,7 +585,7 @@ static CFLocaleRef _CFLocaleCopyCurrentGuts(CFStringRef name, Boolean useCache, // things which call this function thousands or millions of times in // a short period. if (!name) { -#if 0 // DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if 0 // DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX name = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication); #endif } else { @@ -891,7 +891,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C langPref = (CFArrayRef)CFDictionaryGetValue(displayLocale->_prefs, CFSTR("AppleLanguages")); if (langPref) CFRetain(langPref); } else { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX langPref = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); #endif } @@ -916,7 +916,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C } CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX int32_t locale, localeCount = uloc_countAvailable(); CFMutableSetRef working = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeSetCallBacks); for (locale = 0; locale < localeCount; ++locale) { @@ -937,7 +937,7 @@ CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static CFArrayRef __CFLocaleCopyCStringsAsArray(const char* const* p) { CFMutableArrayRef working = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); for (; *p; ++p) { @@ -977,7 +977,7 @@ static CFArrayRef __CFLocaleCopyUEnumerationAsArray(UEnumeration *enumer, UError #endif CFArrayRef CFLocaleCopyISOLanguageCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX const char* const* p = uloc_getISOLanguages(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -986,7 +986,7 @@ CFArrayRef CFLocaleCopyISOLanguageCodes(void) { } CFArrayRef CFLocaleCopyISOCountryCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX const char* const* p = uloc_getISOCountries(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -995,7 +995,7 @@ CFArrayRef CFLocaleCopyISOCountryCodes(void) { } CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_ALL, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1007,7 +1007,7 @@ CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { } CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_COMMON|UCURR_NON_DEPRECATED, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1019,7 +1019,7 @@ CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { } CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef allocator, uint32_t lcid) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char buffer[kMaxICUNameSize]; UErrorCode status = U_ZERO_ERROR; int32_t ret = uloc_getLocaleForLCID(lcid, buffer, kMaxICUNameSize, &status); @@ -1034,7 +1034,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef a } uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIdentifier) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringRef ident = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorSystemDefault, localeIdentifier); char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = ident ? CFStringGetCString(ident, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; @@ -1046,7 +1046,7 @@ uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIden } CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoLangCode) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1066,7 +1066,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoL } CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCode) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1086,7 +1086,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCo } _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE _CFLocaleCalendarDirection calendarDirection = _kCFLocaleCalendarDirectionLeftToRight; Boolean keyExistsAndHasValidFormat = false; Boolean calendarIsRightToLeft = CFPreferencesGetAppBooleanValue(CFSTR("NSLocaleCalendarDirectionIsRightToLeft"), kCFPreferencesAnyApplication, &keyExistsAndHasValidFormat); @@ -1118,7 +1118,7 @@ _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray) { CFMutableArrayRef newArray = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); if (languagesArray && (CFArrayGetTypeID() == CFGetTypeID(languagesArray))) { @@ -1138,7 +1138,7 @@ static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesA #endif CFArrayRef CFLocaleCopyPreferredLanguages(void) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFArrayRef languagesArray = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); CFArrayRef result = _CFLocaleCopyPreferredLanguagesFromPrefs(languagesArray); if (languagesArray) CFRelease(languagesArray); @@ -1180,7 +1180,7 @@ static bool __CFLocaleCopyCodes(CFLocaleRef locale, bool user, CFTypeRef *cf, CF return false; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { UErrorCode icuErr = U_ZERO_ERROR; CFMutableCharacterSetRef working = CFCharacterSetCreateMutable(NULL); @@ -1236,7 +1236,7 @@ CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { #endif static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1257,7 +1257,7 @@ static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1275,7 +1275,7 @@ static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyICUCalendarID(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1360,7 +1360,7 @@ static bool __CFLocaleCopyCalendarID(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (__CFLocaleCopyCalendarID(locale, user, cf, context)) { CFCalendarRef calendar = _CFCalendarCreateCoWWithIdentifier((CFStringRef)*cf); CFCalendarSetLocale(calendar, locale); @@ -1394,7 +1394,7 @@ static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, } static bool __CFLocaleCopyDelimiter(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX ULocaleDataDelimiterType type = (ULocaleDataDelimiterType)0; if (context == kCFLocaleQuotationBeginDelimiterKey) { type = ULOCDATA_QUOTATION_START; @@ -1465,7 +1465,7 @@ static bool __CFLocaleCopyCollatorID(CFLocaleRef locale, bool user, CFTypeRef *c return canonLocaleCFStr ? true : false; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE STATIC_CONST_STRING_DECL(_metricUnitsKey, "AppleMetricUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsKey, "AppleMeasurementUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsCentimeters, "Centimeters"); @@ -1496,7 +1496,7 @@ static void __CFLocaleGetPreferencesForMeasurementSystem(UMeasurementSystem meas } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) +#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, bool *outCelsius) { if (temperaturePref) { if (CFEqual(temperaturePref, kCFLocaleTemperatureUnitCelsius)) { @@ -1511,13 +1511,13 @@ static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED)) +#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE)) static CFStringRef _CFLocaleGetTemperatureUnitName(bool celsius) { return celsius? kCFLocaleTemperatureUnitCelsius: kCFLocaleTemperatureUnitFahrenheit; } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" @@ -1560,11 +1560,11 @@ static bool __CFLocaleGetMeasurementSystemForName(CFStringRef name, UMeasuremen #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UMeasurementSystem *outMeasurementSystem) { UMeasurementSystem output = UMS_SI; // Default is Metric bool done = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (user) { CFTypeRef metricPref = CFDictionaryGetValue(locale->_prefs, _metricUnitsKey); CFTypeRef measurementPref = CFDictionaryGetValue(locale->_prefs, _measurementUnitsKey); @@ -1590,7 +1590,7 @@ static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UM static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = system != UMS_US ? kCFBooleanTrue : kCFBooleanFalse; @@ -1602,7 +1602,7 @@ static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyMeasurementSystem(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = CFRetain(__CFLocaleGetMeasurementSystemName(system)); @@ -1619,13 +1619,13 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR #if U_ICU_VERSION_MAJOR_NUM > 54 bool celsius = true; // Default is Celsius bool done = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (user) { CFTypeRef temperatureUnitPref = CFDictionaryGetValue(locale->_prefs, _temperatureUnitKey); done = _CFLocaleGetTemperatureUnitForPreferences(temperatureUnitPref, &celsius); } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (!done) { char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1663,7 +1663,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterDecimalStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1679,7 +1679,7 @@ static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef // so we have to have another routine here which creates a Currency number formatter. static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterCurrencyStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1691,7 +1691,7 @@ static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef return false; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX typedef int32_t (*__CFICUFunction)(const char *, const char *, UChar *, int32_t, UErrorCode *); static bool __CFLocaleICUName(const char *locale, const char *valLocale, CFStringRef *out, __CFICUFunction icu) { @@ -1763,7 +1763,7 @@ static bool __CFLocaleICUCurrencyName(const char *locale, const char *value, UCu #endif static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; int32_t size; UChar name[kMaxICUNameSize]; @@ -1796,7 +1796,7 @@ static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRe } static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUName(locale, value, out, uloc_getDisplayLanguage); #else *out = CFRetain(CFSTR("(none)")); @@ -1805,7 +1805,7 @@ static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStri } static bool __CFLocaleCountryName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) < sizeof(lid) - 3) { @@ -1821,7 +1821,7 @@ static bool __CFLocaleCountryName(const char *locale, const char *value, CFStrin } static bool __CFLocaleScriptName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) == 4) { @@ -1838,7 +1838,7 @@ static bool __CFLocaleScriptName(const char *locale, const char *value, CFString } static bool __CFLocaleVariantName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (strlen(value) < sizeof(lid) - 6) { @@ -1854,7 +1854,7 @@ static bool __CFLocaleVariantName(const char *locale, const char *value, CFStrin } static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCalendarKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1863,7 +1863,7 @@ static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStri } static bool __CFLocaleCollationName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCollationKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1872,7 +1872,7 @@ static bool __CFLocaleCollationName(const char *locale, const char *value, CFStr } static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_SYMBOL_NAME, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1881,7 +1881,7 @@ static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, C } static bool __CFLocaleCurrencyFullName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_LONG_NAME, out); #else *out = CFRetain(CFSTR("(none)")); diff --git a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c index f97bd79294..4b22c1159e 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c +++ b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c @@ -58,7 +58,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include #else #define ULOC_KEYWORD_SEPARATOR '@' @@ -1155,7 +1155,7 @@ enum { }; */ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX struct LocaleToLegacyCodes { const char * locale; // reduced to language plus one other component (script, region, variant), separators normalized to'_' @@ -1593,7 +1593,7 @@ static void _UpdateFullLocaleString(char inLocaleString[], int locStringMaxLen, // If so, copy the keywords to varKeyValueString and delete the variant tag // from the original string (but don't otherwise use the ICU canonicalization). varKeyValueString[0] = 0; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (variantTag) { UErrorCode icuStatus; int icuCanonStringLen; @@ -1720,7 +1720,7 @@ static void _GetKeyValueString(char inLocaleString[], char keyValueString[]) { } static void _AppendKeyValueString(char inLocaleString[], int locStringMaxLen, char keyValueString[]) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (keyValueString[0] != 0) { UErrorCode uerr = U_ZERO_ERROR; UEnumeration * uenum = uloc_openKeywords(keyValueString, &uerr); @@ -1952,12 +1952,12 @@ SPI: CFLocaleGetLanguageRegionEncodingForLocaleIdentifier gets the appropriate preferred localization in the current context (this function returns NO for a NULL localeIdentifier); and in this function langCode, regCode, and scriptCode are all SInt16* (not SInt32* like the equivalent parameters in CFBundleGetLocalizationInfoForLocalization). */ -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ); #endif Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeIdentifier, LangCode *langCode, RegionCode *regCode, ScriptCode *scriptCode, CFStringEncoding *stringEncoding) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX Boolean returnValue = false; CFStringRef canonicalIdentifier = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, localeIdentifier); if (canonicalIdentifier) { @@ -2035,7 +2035,7 @@ Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeI #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ) { const char * localeString1 = ((const LocaleToLegacyCodes *)entry1)->locale; const char * localeString2 = ((const LocaleToLegacyCodes *)entry2)->locale; @@ -2045,7 +2045,7 @@ static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *en CFDictionaryRef CFLocaleCreateComponentsFromLocaleIdentifier(CFAllocatorRef allocator, CFStringRef localeID) { CFMutableDictionaryRef working = CFDictionaryCreateMutable(allocator, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char cLocaleID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; char buffer[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -2175,7 +2175,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato free(variant); free(buf1); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX for (CFIndex idx = 0; idx < cnt; idx++) { if (keys[idx]) { char *key = __CStringFromString(keys[idx]); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index e2594e4cde..eb91845eb6 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -111,7 +111,7 @@ CFAbsoluteTime CFAbsoluteTimeGetCurrent(void) { #if DEPLOYMENT_RUNTIME_SWIFT CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { CFDateGetTypeID(); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE uint64_t tsr = mach_absolute_time(); return (CFTimeInterval)((double)tsr * __CF1_TSRRate); #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD @@ -360,7 +360,7 @@ CFAbsoluteTime CFGregorianDateGetAbsoluteTime(CFGregorianDate gdate, CFTimeZoneR CFAbsoluteTime at; at = 86400.0 * __CFAbsoluteFromYMD(gdate.year - 2001, gdate.month, gdate.day); at += 3600.0 * gdate.hour + 60.0 * gdate.minute + gdate.second; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -379,7 +379,7 @@ CFGregorianDate CFAbsoluteTimeGetGregorianDate(CFAbsoluteTime at, CFTimeZoneRef int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -407,7 +407,7 @@ CFAbsoluteTime CFAbsoluteTimeAddGregorianUnits(CFAbsoluteTime at, CFTimeZoneRef CFAbsoluteTime candidate_at0, candidate_at1; uint8_t monthdays; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -526,7 +526,7 @@ CFGregorianUnits CFAbsoluteTimeGetDifferenceAsGregorianUnits(CFAbsoluteTime at1, SInt32 CFAbsoluteTimeGetDayOfWeek(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -542,7 +542,7 @@ SInt32 CFAbsoluteTimeGetDayOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { CFAbsoluteTime fixedat; int64_t absolute, year; int8_t month, day; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -561,7 +561,7 @@ SInt32 CFAbsoluteTimeGetWeekOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } diff --git a/CoreFoundation/Parsing.subproj/CFPropertyList.c b/CoreFoundation/Parsing.subproj/CFPropertyList.c index 876990643a..f68ee1e62a 100644 --- a/CoreFoundation/Parsing.subproj/CFPropertyList.c +++ b/CoreFoundation/Parsing.subproj/CFPropertyList.c @@ -2320,7 +2320,7 @@ static CFStringEncoding encodingForXMLData(CFDataRef data, CFErrorRef *error, CF if (len == 5 && (*base == 'u' || *base == 'U') && (base[1] == 't' || base[1] == 'T') && (base[2] == 'f' || base[2] == 'F') && (base[3] == '-') && (base[4] == '8')) return kCFStringEncodingUTF8; encodingName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, base, len, kCFStringEncodingISOLatin1, false); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringEncoding enc = CFStringConvertIANACharSetNameToEncoding(encodingName); if (enc != kCFStringEncodingInvalidId) { CFRelease(encodingName); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c index b76e816376..df16a4d5fe 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c @@ -500,7 +500,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) retval = false; if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE retval = dlopen_preflight(buff); #endif if (!retval && error) { @@ -519,7 +519,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) if (hasSuitableArch) { uint32_t mainFlags = 0; if (_CFBundleGrokObjCImageInfoFromMainExecutable(NULL, &mainFlags) && (mainFlags & 0x2) != 0) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE uint32_t bundleFlags = 0; if (_CFBundleGetObjCImageInfo(bundle, NULL, &bundleFlags) && (bundleFlags & 0x2) == 0) hasRuntimeMismatch = true; #endif diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index ba8c027381..b829b2fc01 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -194,7 +194,7 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL if (!foundIt) { if (lookupMainExe) executableName = _CFBundleCopyExecutableName(bundle, url, infoDict); if (executableName) { -#if (DEPLOYMENT_TARGET_EMBEDDED && !TARGET_IPHONE_SIMULATOR) +#if (TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR) Boolean doExecSearch = false; #else Boolean doExecSearch = true; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c index a8f9f3f6a7..94db44d105 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c @@ -970,7 +970,7 @@ CF_PRIVATE CFArrayRef _CFBundleCopyArchitecturesForExecutable(CFURLRef url) { return result; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static Boolean _CFBundleGetObjCImageInfoForExecutable(CFURLRef url, uint32_t *objcVersion, uint32_t *objcFlags) { Boolean retval = false; (void)_CFBundleGrokFileType(url, NULL, NULL, NULL, NULL, NULL, &retval, objcVersion, objcFlags); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index c465a5de3e..167092f335 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -430,7 +430,7 @@ static _CFBundleFileVersion _CFBundleVersionForFileName(CFStringRef fileName, CF if (c == '.') { dotLocation = i; } -#if DEPLOYMENT_TARGET_EMBEDDED +#if TARGET_OS_IPHONE // Product names are only supported on iOS // ref docs here: "iOS Supports Device-Specific Resources" in "Resource Programming Guide" else if (c == '~' && !foundProduct) { diff --git a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c index c587cbc205..e2e7d285da 100644 --- a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c +++ b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c @@ -17,7 +17,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #endif diff --git a/CoreFoundation/RunLoop.subproj/CFMessagePort.c b/CoreFoundation/RunLoop.subproj/CFMessagePort.c index 56e07ad034..cf743bc0a3 100644 --- a/CoreFoundation/RunLoop.subproj/CFMessagePort.c +++ b/CoreFoundation/RunLoop.subproj/CFMessagePort.c @@ -28,7 +28,7 @@ #include #if __HAS_DISPATCH__ #include -#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) && __has_include() +#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) && __has_include() #include #endif #endif diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index 175d92e48e..f9bc80e681 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -48,7 +48,7 @@ CF_INLINE uint64_t check_uint64_add(uint64_t x, uint64_t y, int32_t* err) { }; #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #define USE_DISPATCH_SOURCE_FOR_TIMERS __HAS_DISPATCH__ #define USE_MK_TIMER_TOO 1 #else diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 45a84aeb14..84ce0a1a1a 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -1029,7 +1029,7 @@ static void timeradd(struct timeval *a, struct timeval *b, struct timeval *res) static _CFThreadRef __cfSocketTid() { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 245af92368..15b1fd8890 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -19,7 +19,7 @@ #include #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // On Mach these live in CF for historical reasons, even though they are declared in CFNetwork const int kCFStreamErrorDomainSSL = 3; @@ -109,7 +109,7 @@ static struct { #define CFNETWORK_CALL(sym, args) ((CFNetworkSupport.sym)args) -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define CFNETWORK_LOAD_SYM(sym) __CFLookupCFNetworkFunction(#sym) #elif DEPLOYMENT_TARGET_WINDOWS #define CFNETWORK_LOAD_SYM(sym) (void *)GetProcAddress(CFNetworkSupport.image, #sym) @@ -118,7 +118,7 @@ static struct { static void initializeCFNetworkSupport(void) { __CFBitSet(CFNetworkSupport.flags, kTriedToLoad); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CFNetworkSupport._CFSocketStreamCreatePair = CFNETWORK_LOAD_SYM(_CFSocketStreamCreatePair); CFNetworkSupport._CFErrorCreateWithStreamError = CFNETWORK_LOAD_SYM(_CFErrorCreateWithStreamError); CFNetworkSupport._CFStreamErrorFromCFError = CFNETWORK_LOAD_SYM(_CFStreamErrorFromCFError); diff --git a/CoreFoundation/Stream.subproj/CFStream.c b/CoreFoundation/Stream.subproj/CFStream.c index 851da0be4f..56ef74c63d 100644 --- a/CoreFoundation/Stream.subproj/CFStream.c +++ b/CoreFoundation/Stream.subproj/CFStream.c @@ -1742,7 +1742,7 @@ static CFRunLoopRef _legacyStreamRunLoop() pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif _CFThreadRef workThread; diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index 3ba7efe54d..4cab25ac91 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -34,7 +34,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -6740,7 +6740,7 @@ static CFIndex __CFStringValidateFormat(CFStringRef expected, CFStringRef untrus if (!verified) { if (errorPtr) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFStringRef debugMsg = CFStringCreateWithFormat(tmpAlloc, NULL, CFSTR("Format '%@' does not match expected '%@'"), untrustedFormat, expected); CFMutableDictionaryRef userInfo = CFDictionaryCreateMutable(tmpAlloc, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(userInfo, kCFErrorDebugDescriptionKey, debugMsg); diff --git a/CoreFoundation/String.subproj/CFStringEncodings.c b/CoreFoundation/String.subproj/CFStringEncodings.c index c69bd74c8f..57db72ed30 100644 --- a/CoreFoundation/String.subproj/CFStringEncodings.c +++ b/CoreFoundation/String.subproj/CFStringEncodings.c @@ -809,7 +809,7 @@ CFIndex CFStringGetMaximumSizeOfFileSystemRepresentation(CFStringRef string) { } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithErrorStatus(CFStringRef string, char *buffer, CFIndex maxBufLen, CFIndex *characterIndex) { #define MAX_STACK_BUFFER_LEN (255) const UTF16Char *characters = CFStringGetCharactersPtr(string); @@ -892,7 +892,7 @@ _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithE #endif Boolean CFStringGetFileSystemRepresentation(CFStringRef string, char *buffer, CFIndex maxBufLen) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE return _CFStringGetFileSystemRepresentationWithErrorStatus(string, buffer, maxBufLen, NULL) == _kCFStringFileSystemRepresentationErrorNone; #else return CFStringGetCString(string, buffer, maxBufLen, CFStringFileSystemEncoding()); diff --git a/CoreFoundation/String.subproj/CFStringTransform.c b/CoreFoundation/String.subproj/CFStringTransform.c index 04b3ff8a14..0d1c1948b1 100644 --- a/CoreFoundation/String.subproj/CFStringTransform.c +++ b/CoreFoundation/String.subproj/CFStringTransform.c @@ -28,7 +28,7 @@ static const char *__CFStringTransformGetICUIdentifier(CFStringRef identifier); #include #endif -#if DEPLOYMENT_TARGET_EMBEDDED +#if TARGET_OS_IPHONE #define LITE_CACHE 1 #endif diff --git a/CoreFoundation/String.subproj/CFStringUtilities.c b/CoreFoundation/String.subproj/CFStringUtilities.c index 9f0cb989ea..3acfb67195 100644 --- a/CoreFoundation/String.subproj/CFStringUtilities.c +++ b/CoreFoundation/String.subproj/CFStringUtilities.c @@ -17,7 +17,7 @@ #include "CFICUConverters.h" #include #include -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include #include #endif @@ -110,7 +110,7 @@ CFStringEncoding CFStringConvertIANACharSetNameToEncoding(CFStringRef charsetNam encoding = __CFStringEncodingGetFromCanonicalName(name); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingInvalidId == encoding) encoding = __CFStringEncodingGetFromICUName(name); #endif @@ -258,7 +258,7 @@ CFStringEncoding CFStringGetMostCompatibleMacStringEncoding(CFStringEncoding enc #define kCFStringCompareAllocationIncrement (128) -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // ------------------------------------------------------------------------------------------------- // CompareSpecials - ignore case & diacritic differences @@ -420,7 +420,7 @@ static UCollator *__CFStringCopyDefaultCollator(CFLocaleRef compareLocale) { return collator; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static void __collatorFinalize(UCollator *collator) { CFLocaleRef locale = _CFGetTSD(__CFTSDKeyCollatorLocale); _CFSetTSD(__CFTSDKeyCollatorUCollator, NULL, NULL); @@ -526,7 +526,7 @@ static OSStatus __CompareTextDefault(UCollator *collator, CFOptionFlags options, return 0; // noErr } -#endif // DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#endif // DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static inline CFIndex __extendLocationBackward(CFIndex location, CFStringInlineBuffer *str, const uint8_t *nonBaseBMP, const uint8_t *punctBMP) { while (location > 0) { @@ -570,7 +570,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * CFRange range1 = str1Range; CFRange range2 = str2Range; SInt32 order; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX Boolean isEqual; bool forcedOrdering = ((options & kCFCompareForcedOrdering) ? true : false); @@ -604,8 +604,8 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range2.location = __extendLocationBackward(range2.location - 1, str2, nonBaseBMP, punctBMP); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // First we try to use the last one used on this thread, if the locale is the same, // otherwise we try to check out a default one, or then we create one. UCollator *threadCollator = _CFGetTSD(__CFTSDKeyCollatorUCollator); @@ -620,7 +620,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * collator = __CFStringCreateCollator((CFLocaleRef)compareLocale); defaultCollator = false; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE } #endif #endif @@ -632,7 +632,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range1.length = (str1Range.location + str1Range.length) - range1.location; range2.length = (str2Range.location + str2Range.length) - range2.location; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { compResult = ((isEqual && !forcedOrdering) ? kCFCompareEqualTo : ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan)); } else @@ -702,7 +702,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { if (isEqual) { if (forcedOrdering && (kCFCompareEqualTo == compResult) && (0 != order)) compResult = ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan); @@ -739,7 +739,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * if (buffer2Len > 0) CFAllocatorDeallocate(kCFAllocatorSystemDefault, buffer2); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if (collator == threadCollator) { // do nothing, already cached } else { diff --git a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c index 247b857a8a..5170215dc1 100644 --- a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c @@ -220,7 +220,7 @@ static CFIndex __CFStringEncodingConverterReleaseICUConverter(UConverter *conver #define MAX_BUFFER_SIZE (1000) -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #if 0 // we're no longer doing this check. Revive when the status in the bug changed. #if (U_ICU_VERSION_MAJOR_NUM > 49) diff --git a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c index b8eeeea0fe..a6791a62f3 100644 --- a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c @@ -27,7 +27,7 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static const CFStringEncodingConverter __CFICUBootstrap = { .toBytes.standard = NULL, @@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert if (__CFIsPlatformConverterAvailable(encoding)) { return &__CFPlatformBootstrap; } else { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (__CFStringEncodingGetICUName(encoding)) { return &__CFICUBootstrap; } @@ -74,7 +74,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CF_PRIVATE CFStringEncoding *__CFStringEncodingCreateListOfAvailablePlatformConverters(CFAllocatorRef allocator, CFIndex *numberOfConverters) { return NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index 7d86c3fc5e..750c2140cb 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper; break; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX case kCFStringEncodingConverterICU: converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding); break; @@ -696,7 +696,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen); #endif @@ -825,7 +825,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const if (!converter) return kCFStringEncodingConverterUnavailable; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen); #endif @@ -869,7 +869,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_ const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes); #endif @@ -913,7 +913,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars); #endif @@ -998,7 +998,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void if (NULL == encodings) { CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings; CFIndex numICUConverters = 0, numPlatformConverters = 0; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters); #else CFStringEncoding *icuConverters = NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index e601d8d20c..e4e2a0fe93 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -24,7 +24,7 @@ #include #include #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #include #endif @@ -32,7 +32,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define __kCFCharacterSetDir "/System/Library/CoreServices" #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" @@ -40,7 +40,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE #define USE_MACHO_SEGMENT 1 #elif DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) #define USE_RAW_SYMBOL 1 @@ -56,7 +56,7 @@ enum { CF_INLINE uint32_t __CFUniCharMapExternalSetToInternalIndex(uint32_t cset) { return ((kCFUniCharFirstInternalSet <= cset) ? ((cset - kCFUniCharFirstInternalSet) + kCFUniCharLastExternalSet) : cset) - kCFUniCharFirstBitmapSet; } CF_INLINE uint32_t __CFUniCharMapCompatibilitySetID(uint32_t cset) { return ((cset == kCFUniCharControlCharacterSet) ? kCFUniCharControlAndFormatterCharacterSet : (((cset > kCFUniCharLastExternalSet) && (cset < kCFUniCharFirstInternalSet)) ? ((cset - kCFUniCharLastExternalSet) + kCFUniCharFirstInternalSet) : cset)); } -#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) && USE_MACHO_SEGMENT +#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) && USE_MACHO_SEGMENT #include #include #include @@ -114,7 +114,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index 5fea679b02..83ec538552 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -52,7 +52,7 @@ static CFStringRef POSIXPathToURLPath(CFStringRef path, CFAllocatorRef alloc, Bo static CFStringRef CreateStringFromFileSystemRepresentationByAddingPercentEscapes(CFAllocatorRef alloc, const UInt8 *bytes, CFIndex numBytes, Boolean isDirectory, Boolean isAbsolute, Boolean windowsPath, Boolean *addedPercentEncoding) CF_RETURNS_RETAINED; CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLRef anURL, CFURLPathStyle fsType, Boolean resolveAgainstBase) CF_RETURNS_RETAINED; CF_EXPORT CFURLRef _CFURLCreateCurrentDirectoryURL(CFAllocatorRef allocator) CF_RETURNS_RETAINED; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static Boolean _CFURLHasFileURLScheme(CFURLRef url, Boolean *hasScheme); #endif @@ -66,7 +66,7 @@ static CONST_STRING_DECL(kCFURLHTTPSScheme, "https") static CONST_STRING_DECL(kCFURLFileScheme, "file") static CONST_STRING_DECL(kCFURLDataScheme, "data") static CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE static CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #else @@ -75,7 +75,7 @@ CONST_STRING_DECL(kCFURLHTTPSScheme, "https") CONST_STRING_DECL(kCFURLFileScheme, "file") CONST_STRING_DECL(kCFURLDataScheme, "data") CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #endif @@ -2348,7 +2348,7 @@ CFURLRef _CFURLCopyFileURL(CFURLRef url) { struct __CFURL *result = NULL; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE // make sure we have a CFURL since this might be a subclassed NSURL url = _CFURLFromNSURL(url); __CFGenericValidateType(url, CFURLGetTypeID()); @@ -2841,7 +2841,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { uint8_t numberOfRanges; const CFRange *baseRanges; Boolean baseIsObjC; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE Boolean filePathURLCreated = false; #endif @@ -2858,7 +2858,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { if (!base) { return (CFURLRef)CFRetain(relativeURL); } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE else if ( CFURLIsFileReferenceURL(base) && !CFURLHasDirectoryPath(base) ) { // 16695827 - If the base URL is a file reference URL which doesn't end with a slash, we have to convert it to a file path URL before we can make it absolute. base = CFURLCreateFilePathURL(alloc, base, NULL); @@ -2895,7 +2895,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( filePathURLCreated ) { CFRelease(base); } @@ -4655,7 +4655,7 @@ CFStringRef CFURLCopyLastPathComponent(CFURLRef url) { } } else { Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(CFGetAllocator(url), url, NULL); @@ -4784,7 +4784,7 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe CFAssert1(pathComponent != NULL, __kCFLogAssertion, "%s(): Cannot be called with a NULL component to append", __PRETTY_FUNCTION__); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL if possible (only because this is appending a path component) CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4848,7 +4848,7 @@ CFURLRef CFURLCreateCopyDeletingLastPathComponent(CFAllocatorRef allocator, CFUR __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4930,7 +4930,7 @@ CFURLRef CFURLCreateCopyAppendingPathExtension(CFAllocatorRef allocator, CFURLRe __CFGenericValidateType(extension, CFStringGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4991,7 +4991,7 @@ CFURLRef CFURLCreateCopyDeletingPathExtension(CFAllocatorRef allocator, CFURLRef __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -5134,7 +5134,7 @@ CFURLRef _CFURLCreateFromPropertyListRepresentation(CFAllocatorRef alloc, CFProp return url; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE Boolean _CFURLIsFileReferenceURL(CFURLRef url) { return ( CFURLIsFileReferenceURL(url) ); @@ -5160,7 +5160,7 @@ Boolean CFURLIsFileReferenceURL(CFURLRef url) } #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE CFURLRef CFURLCreateFilePathURL(CFAllocatorRef alloc, CFURLRef url, CFErrorRef *error) { diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index b34fe161ec..31bd8fb854 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -45,7 +45,7 @@ CFData read/write routines #include #endif -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE DEFINE_WEAK_CFNETWORK_FUNC_FAIL(Boolean, _CFURLCreateDataAndPropertiesFromResource, (CFAllocatorRef A, CFURLRef B, CFDataRef *C, CFDictionaryRef *D, CFArrayRef E, SInt32 *F), (A, B, C, D, E, F), { if(C) *C=NULL; if (D) *D=NULL; if(F) *F=kCFURLImproperArgumentsError; }, false) @@ -712,7 +712,7 @@ Boolean CFURLCreateDataAndPropertiesFromResource(CFAllocatorRef alloc, CFURLRef } else if (CFStringCompare(scheme, CFSTR("data"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { result = _CFDataURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode); } else { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE result = __CFNetwork__CFURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, fetchedProperties, desiredProperties, errorCode); #else if (fetchedData) *fetchedData = NULL; @@ -779,7 +779,7 @@ Boolean CFURLWriteDataAndPropertiesToResource(CFURLRef url, CFDataRef data, CFDi return success; } else { CFRelease(scheme); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE Boolean result = __CFNetwork__CFURLWriteDataAndPropertiesToResource(url, data, propertyDict, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; @@ -825,7 +825,7 @@ Boolean CFURLDestroyResource(CFURLRef url, SInt32 *errorCode) { } } else { CFRelease(scheme); -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED +#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE Boolean result = __CFNetwork__CFURLDestroyResource(url, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; diff --git a/Docs/Design.md b/Docs/Design.md index 4ee1e77dcb..cad1157abb 100644 --- a/Docs/Design.md +++ b/Docs/Design.md @@ -124,5 +124,5 @@ Parts of the CoreFoundation and Foundation libraries are as old as macOS (or old There are some additional considerations when working on the CoreFoundation part of our code, both because it is written in C and also because it is shared amongst platforms. * Surround Swift-runtime-specific code with the standard macro `#if DEPLOYMENT_RUNTIME_SWIFT`. -* Surround platform-specific code with our standard macros `DEPLOYMENT_TARGET_MACOSX`, `DEPLOYMENT_TARGET_EMBEDDED` (all iOS platforms and derivatives), `DEPLOYMENT_TARGET_LINUX`. +* Surround platform-specific code with our standard macros `DEPLOYMENT_TARGET_MACOSX`, `TARGET_OS_IPHONE` (all iOS platforms and derivatives), `DEPLOYMENT_TARGET_LINUX`. * Follow the coding style of the .c file that you are working in. From db68efdcd5bb96b949b4a16fefec654d14cbe12d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 10:14:35 -0700 Subject: [PATCH 05/10] DEPLOYMENT_TARGET_MACOSX -> TARGET_OS_OSX --- CMakeLists.txt | 2 - CoreFoundation/Base.subproj/CFBase.c | 34 +++---- CoreFoundation/Base.subproj/CFFileUtilities.c | 4 +- CoreFoundation/Base.subproj/CFInternal.h | 12 +-- .../Base.subproj/CFKnownLocations.c | 2 +- CoreFoundation/Base.subproj/CFPlatform.c | 32 +++---- CoreFoundation/Base.subproj/CFRuntime.c | 20 ++-- .../Base.subproj/CFSystemDirectories.c | 4 +- CoreFoundation/Base.subproj/CFUUID.c | 2 +- CoreFoundation/Base.subproj/CFUtilities.c | 58 ++++++------ .../Base.subproj/CoreFoundation_Prefix.h | 4 +- .../Base.subproj/ForFoundationOnly.h | 12 +-- CoreFoundation/CMakeLists.txt | 4 - .../Collections.subproj/CFBasicHash.c | 8 +- CoreFoundation/Collections.subproj/CFData.c | 2 +- .../Collections.subproj/CFStorage.c | 2 +- CoreFoundation/Collections.subproj/CFTree.c | 2 +- CoreFoundation/Error.subproj/CFError.c | 14 +-- .../Locale.subproj/CFDateFormatter.c | 4 +- CoreFoundation/Locale.subproj/CFLocale.c | 94 +++++++++---------- .../Locale.subproj/CFLocaleIdentifier.c | 18 ++-- CoreFoundation/NumberDate.subproj/CFDate.c | 18 ++-- CoreFoundation/NumberDate.subproj/CFNumber.c | 2 +- .../Parsing.subproj/CFBinaryPList.c | 2 +- .../Parsing.subproj/CFPropertyList.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle.c | 12 +-- .../PlugIn.subproj/CFBundle_Binary.c | 4 +- .../PlugIn.subproj/CFBundle_BinaryTypes.h | 2 +- .../PlugIn.subproj/CFBundle_Executable.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle_Grok.c | 2 +- .../PlugIn.subproj/CFBundle_Locale.c | 2 +- .../PlugIn.subproj/CFBundle_Resources.c | 10 +- .../PlugIn.subproj/CFBundle_Strings.c | 2 +- .../PlugIn.subproj/CFBundle_Tables.c | 8 +- .../CFApplicationPreferences.c | 2 +- .../RunLoop.subproj/CFMessagePort.c | 2 +- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 40 ++++---- CoreFoundation/RunLoop.subproj/CFSocket.c | 26 ++--- .../Stream.subproj/CFConcreteStreams.c | 6 +- .../Stream.subproj/CFSocketStream.c | 6 +- CoreFoundation/Stream.subproj/CFStream.c | 2 +- CoreFoundation/String.subproj/CFBurstTrie.c | 2 +- CoreFoundation/String.subproj/CFString.c | 22 ++--- .../String.subproj/CFStringEncodings.c | 4 +- .../String.subproj/CFStringUtilities.c | 24 ++--- .../StringEncodings.subproj/CFICUConverters.c | 2 +- .../CFPlatformConverters.c | 6 +- .../CFStringEncodingConverter.c | 14 +-- .../CFStringEncodingDatabase.c | 12 +-- .../StringEncodings.subproj/CFUniChar.c | 24 ++--- CoreFoundation/URL.subproj/CFURL.c | 46 ++++----- CoreFoundation/URL.subproj/CFURL.inc.h | 2 +- CoreFoundation/URL.subproj/CFURLAccess.c | 14 +-- CoreFoundation/build.py | 1 - Docs/Design.md | 2 +- Foundation.xcodeproj/project.pbxproj | 4 - build.py | 1 - 57 files changed, 327 insertions(+), 339 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d67d3e36..a45467d4b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,8 +90,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android OR CMAKE_SYSTEM_NAME STREQUAL Linux) set(deployment_target -DDEPLOYMENT_TARGET_LINUX) set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN") set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR}) -elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(deployment_target -DDEPLOYMENT_TARGET_MACOSX) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN") set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR}) diff --git a/CoreFoundation/Base.subproj/CFBase.c b/CoreFoundation/Base.subproj/CFBase.c index 8b4a3d34a9..6ba312b28d 100644 --- a/CoreFoundation/Base.subproj/CFBase.c +++ b/CoreFoundation/Base.subproj/CFBase.c @@ -17,7 +17,7 @@ #if _POSIX_THREADS #include #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #include @@ -29,7 +29,7 @@ struct __CFAllocator { CFRuntimeBase _base; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // CFAllocator structure must match struct _malloc_zone_t! // The first two reserved fields in struct _malloc_zone_t are for us with CFRuntimeBase size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */ @@ -465,7 +465,7 @@ void CFAllocatorSetDefault(CFAllocatorRef allocator) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; // require allocator to this function to be an allocator } @@ -491,7 +491,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC CFAllocatorRetainCallBack retainFunc; CFAllocatorAllocateCallBack allocateFunc; void *retainedInfo; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator && kCFAllocatorUseContext != allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return NULL; // require allocator to this function to be an allocator } @@ -525,7 +525,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC memset(memory, 0, sizeof(CFRuntimeBase)); __CFRuntimeSetRC(memory, 1); _CFAllocatorSetInstanceTypeIDAndIsa(memory); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE memory->size = __CFAllocatorCustomSize; memory->malloc = __CFAllocatorCustomMalloc; memory->calloc = __CFAllocatorCustomCalloc; @@ -574,7 +574,7 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -582,7 +582,7 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif if (0 == size) return NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_IOS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_malloc((malloc_zone_t *)allocator, size); } @@ -605,7 +605,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -613,7 +613,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif if (NULL == ptr && 0 < newsize) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_malloc((malloc_zone_t *)allocator, newsize); } @@ -626,7 +626,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return newptr; } if (NULL != ptr && 0 == newsize) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -643,7 +643,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return NULL; } if (NULL == ptr && 0 == newsize) return NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_realloc((malloc_zone_t *)allocator, ptr, newsize); } @@ -661,14 +661,14 @@ void CFAllocatorDeallocate(CFAllocatorRef allocator, void *ptr) { allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -691,14 +691,14 @@ CFIndex CFAllocatorGetPreferredSizeForSize(CFAllocatorRef allocator, CFIndex siz allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_good_size(size); } @@ -716,7 +716,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -724,7 +724,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif CFAssert1(0 == context->version, __kCFLogAssertion, "%s(): context version not initialized to 0", __PRETTY_FUNCTION__); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; } diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index af3ae4dddd..1c2b8da7de 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, FindClose(handle); pathBuf[pathLength] = '\0'; -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uint8_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla if (dent->d_type == DT_DIR) { isDirectory = true; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD else if (dent->d_type == DT_UNKNOWN) { // We need to do an additional stat on this to see if it's really a directory or not. // This path should be uncommon. diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index 6825a1df73..c65caab653 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -131,7 +131,7 @@ typedef struct os_log_s *os_log_t; #define _CF_CONSTANT_OBJECT_BACKING const #endif -#if DEPLOYMENT_TARGET_MACOSX && DEPLOYMENT_RUNTIME_SWIFT +#if TARGET_OS_OSX && DEPLOYMENT_RUNTIME_SWIFT // This target configuration some how misses the availability macros to let these be defined, so this works-around the missing definitions #ifndef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER #define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {_PTHREAD_ERRORCHECK_MUTEX_SIG_init, {0}} @@ -166,7 +166,7 @@ CF_EXPORT CFArrayRef _CFGetWindowsBinaryDirectories(void); CF_EXPORT CFStringRef _CFStringCreateHostName(void); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include CF_EXPORT void _CFMachPortInstallNotifyPort(CFRunLoopRef rl, CFStringRef mode); #endif @@ -678,7 +678,7 @@ CF_PRIVATE void _CF_dispatch_once(dispatch_once_t *, void (^)(void)); #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE _Atomic(uint8_t) __CF120293; CF_PRIVATE _Atomic(uint8_t) __CF120290; extern void __THE_PROCESS_HAS_FORKED_AND_YOU_CANNOT_USE_THIS_COREFOUNDATION_FUNCTIONALITY___YOU_MUST_EXEC__(void); @@ -856,7 +856,7 @@ CF_INLINE uintptr_t __CFISAForTypeID(CFTypeID typeID) { // DEFINE_WEAK_CARBONCORE_FUNC(void, DisposeHandle, (Handle h), (h)) // -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE extern void *__CFLookupCFNetworkFunction(const char *name); @@ -881,7 +881,7 @@ extern void *__CFLookupCFNetworkFunction(const char *name); #define DEFINE_WEAK_CARBONCORE_FUNC(R, N, P, A, ...) -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE extern void *__CFLookupCoreServicesInternalFunction(const char *name); @@ -1083,7 +1083,7 @@ CF_PRIVATE uint8_t *_CFDataGetBytePtrNonObjC(CFDataRef data); #pragma mark - #pragma mark CF Instruments SPI -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE extern void __CFRecordAllocationEvent(int eventnum, void *ptr, int64_t size, uint64_t data, const char *classname); #else #define __CFRecordAllocationEvent(a, b, c, d, e) ((void)0) diff --git a/CoreFoundation/Base.subproj/CFKnownLocations.c b/CoreFoundation/Base.subproj/CFKnownLocations.c index 4d987a859c..958b5a1831 100644 --- a/CoreFoundation/Base.subproj/CFKnownLocations.c +++ b/CoreFoundation/Base.subproj/CFKnownLocations.c @@ -18,7 +18,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUser user, CFStringRef _Nullable username) { CFURLRef location = NULL; -#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if (TARGET_OS_OSX || TARGET_OS_IPHONE) /* Building for a Darwin OS. (We use these paths on Swift builds as well, so that we can interoperate a little with Darwin's defaults(1) command and the other system facilities; but you want to use the system version of CF if possible on those platforms, which will talk to cfprefsd(8) and has stronger interprocess consistency guarantees.) diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index f06efab6da..a4433a7338 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -11,7 +11,7 @@ #include "CFInternal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #include @@ -35,7 +35,7 @@ #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #define kCFPlatformInterfaceStringEncoding kCFStringEncodingUTF8 #else #define kCFPlatformInterfaceStringEncoding CFStringGetSystemEncoding() @@ -43,7 +43,7 @@ extern void __CFGetUGIDs(uid_t *euid, gid_t *egid); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // CoreGraphics and LaunchServices are only projects (1 Dec 2006) that use these char **_CFArgv(void) { return *_NSGetArgv(); } int _CFArgc(void) { return *_NSGetArgc(); } @@ -126,16 +126,16 @@ const char *_CFProcessPath(void) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) { return pthread_main_np() == 1; } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE const char *_CFProcessPath(void) { if (__CFProcessPath) return __CFProcessPath; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (!__CFProcessIsRestricted()) { const char *path = (char *)__CFgetenv("CFProcessPath"); if (path) { @@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) { } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include @@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) { CF_EXPORT CFStringRef CFCopyUserName(void) { CFStringRef result = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD uid_t euid; __CFGetUGIDs(&euid, NULL); struct passwd *upwd = getpwuid(euid ? euid : getuid()); @@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); #elif DEPLOYMENT_TARGET_WINDOWS CFURLRef retVal = NULL; @@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (!uName) { return _CFCopyHomeDirURLForUser(NULL, true); } else { @@ -612,7 +612,7 @@ CF_PRIVATE void __CFTSDInitialize() { #endif static void __CFTSDSetSpecific(void *arg) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE pthread_setspecific(__CFTSDIndexKey, arg); #elif DEPLOYMENT_TARGET_LINUX pthread_setspecific(__CFTSDIndexKey, arg); @@ -622,7 +622,7 @@ static void __CFTSDSetSpecific(void *arg) { } static void *__CFTSDGetSpecific() { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE return pthread_getspecific(__CFTSDIndexKey); #elif DEPLOYMENT_TARGET_LINUX return pthread_getspecific(__CFTSDIndexKey); @@ -674,7 +674,7 @@ static void __CFTSDFinalize(void *arg) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE extern int pthread_key_init_np(int, void (*)(void *)); #endif @@ -1463,7 +1463,7 @@ typedef struct tagTHREADNAME_INFO #endif CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_Nonnull name) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (pthread_equal(pthread_self(), thread)) { return pthread_setname_np(name); } @@ -1489,7 +1489,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ } CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE return pthread_getname_np(pthread_self(), buf, length); #elif DEPLOYMENT_TARGET_LINUX return pthread_getname_np(pthread_self(), buf, length); @@ -1498,7 +1498,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { } CF_EXPORT char **_CFEnviron(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE return *_NSGetEnviron(); #elif DEPLOYMENT_TARGET_WINDOWS return _environ; diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 43e3ee238c..cfd0eb0f9b 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -21,7 +21,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #include @@ -60,7 +60,7 @@ __kCFReleaseEvent = 29 #define FAKE_INSTRUMENTS 0 -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE void __CFOAInitializeNSObject(void); // from NSObject.m bool __CFOASafe = false; @@ -404,7 +404,7 @@ CF_INLINE uint32_t __CFHighRCFromInfo(__CFInfoType info) { CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const char *className) { CFRuntimeBase *memory; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE memory = malloc_zone_memalign(malloc_default_zone(), align, size); #elif DEPLOYMENT_TARGET_LINUX int result = posix_memalign((void **)&memory, /*alignment*/ align, size); @@ -601,7 +601,7 @@ enum { __kCFObjectReleasedEvent = 13 }; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX #define NUM_EXTERN_TABLES 8 #define EXTERN_TABLE_IDX(O) (((uintptr_t)(O) >> 8) & 0x7) #else @@ -971,7 +971,7 @@ CF_PRIVATE void __CFTSDWindowsCleanup(void); CF_PRIVATE void __CFFinalizeWindowsThreadData(); #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE _Atomic(uint8_t) __CF120290 = false; static _Atomic(uint8_t) __CF120291 = false; _Atomic(uint8_t) __CF120293 = false; @@ -989,7 +989,7 @@ static void __01123__(void) { // This is not a problem for CF. if (__CF120290) { __CF120293 = true; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (__CF120291) { CRSetCrashLogMessage2("*** multi-threaded process forked ***"); } else { @@ -1145,7 +1145,7 @@ void __CFInitialize(void) { } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE UInt32 s, r; __CFStringGetUserDefaultEncoding(&s, &r); // force the potential setenv to occur early pthread_atfork(__01121__, NULL, __01123__); @@ -1162,7 +1162,7 @@ void __CFInitialize(void) { #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE { CFIndex idx, cnt; char **args = *_NSGetArgv(); @@ -1205,7 +1205,7 @@ void __CFInitialize(void) { { CFIndex idx, cnt = 0; char **args = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE args = *_NSGetArgv(); cnt = *_NSGetArgc(); #elif DEPLOYMENT_TARGET_WINDOWS @@ -1256,7 +1256,7 @@ void __CFInitialize(void) { if (value && (*value == 'Y' || *value == 'y')) __CFDeallocateZombies = 0xff; #endif -#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) CFLog(kCFLogLevelWarning, CFSTR("Assertions enabled")); #endif diff --git a/CoreFoundation/Base.subproj/CFSystemDirectories.c b/CoreFoundation/Base.subproj/CFSystemDirectories.c index 25e3ddd90c..991abf47fb 100644 --- a/CoreFoundation/Base.subproj/CFSystemDirectories.c +++ b/CoreFoundation/Base.subproj/CFSystemDirectories.c @@ -18,7 +18,7 @@ #include #include "CFInternal.h" -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE /* We use the System framework implementation on Mach. */ @@ -52,7 +52,7 @@ CFSearchPathEnumerationState __CFGetNextSearchPathEnumeration(CFSearchPathEnumer #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde) { CFMutableArrayRef array; diff --git a/CoreFoundation/Base.subproj/CFUUID.c b/CoreFoundation/Base.subproj/CFUUID.c index c002f00254..e4dde69733 100644 --- a/CoreFoundation/Base.subproj/CFUUID.c +++ b/CoreFoundation/Base.subproj/CFUUID.c @@ -151,7 +151,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) { long rStatus = UuidCreate(&u); if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1; memmove(&bytes, &u, sizeof(bytes)); -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX static Boolean useV1UUIDs = false, checked = false; uuid_t uuid; if (!checked) { diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index fea8821e6b..a02c5b4ab4 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -14,7 +14,7 @@ #include "CFLocaleInternal.h" #include "CFBundle_Internal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #include #endif #include @@ -29,7 +29,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #else #define ASL_LEVEL_EMERG 0 @@ -37,7 +37,7 @@ #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #include @@ -159,7 +159,7 @@ CFHashCode CFHashBytes(uint8_t *bytes, CFIndex length) { #undef ELF_STEP -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE uintptr_t __CFFindPointer(uintptr_t ptr, uintptr_t start) { vm_map_t task = mach_task_self(); mach_vm_address_t address = start; @@ -225,7 +225,7 @@ static CFStringRef copySystemVersionPath(CFStringRef suffix) { // Looks for localized version of "nonLocalized" in the SystemVersion bundle // If not found, and returnNonLocalizedFlag == true, will return the non localized string (retained of course), otherwise NULL // If bundlePtr != NULL, will use *bundlePtr and will return the bundle in there; otherwise bundle is created and released -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRef nonLocalized) { CFStringRef localized = NULL; CFBundleRef locBundle = bundlePtr ? *bundlePtr : NULL; @@ -249,7 +249,7 @@ static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRe static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) { CFPropertyListRef plist = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CFDataRef data; CFURLRef url; @@ -377,7 +377,7 @@ CF_EXPORT Boolean _CFExecutableLinkedOnOrAfter(CFSystemVersion version) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX CF_PRIVATE void *__CFLookupCarbonCoreFunction(const char *name) { static void *image = NULL; static dispatch_once_t onceToken; @@ -392,7 +392,7 @@ CF_PRIVATE void *__CFLookupCarbonCoreFunction(const char *name) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE void *__CFLookupCoreServicesInternalFunction(const char *name) { static void *image = NULL; static dispatch_once_t onceToken; @@ -441,7 +441,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL); v = (v + (v >> 4)) & 0xf0f0f0f0f0f0f0fULL; pcnt = (v * 0x0101010101010101ULL) >> ((sizeof(v) - 1) * 8); -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#elif TARGET_OS_OSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_AVAILCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -468,7 +468,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { CF_PRIVATE CFIndex __CFProcessorCount() { int32_t pcnt; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -486,7 +486,7 @@ CF_PRIVATE CFIndex __CFProcessorCount() { CF_PRIVATE uint64_t __CFMemorySize() { uint64_t memsize = 0; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(memsize); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &memsize, &len, NULL, 0); @@ -550,7 +550,7 @@ typedef struct _ugids { CF_PRIVATE void __CFGetUGIDs(uid_t *euid, gid_t *egid) { ugids(^lookup)(void) = ^{ ugids ids; -#if 1 && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if 1 && (TARGET_OS_OSX || TARGET_OS_IPHONE) if (0 != pthread_getugid_np(&ids._euid, &ids._egid)) #endif { @@ -672,7 +672,7 @@ static void _CFShowToFile(FILE *file, Boolean flush, const void *obj) { } } if (!lastNL) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE fprintf_l(file, NULL, "\n"); #else fprintf(file, "\n"); @@ -692,7 +692,7 @@ void CFShow(const void *obj) { // message must be a UTF8-encoded, null-terminated, byte buffer with at least length bytes typedef void (*CFLogFunc)(int32_t lev, const char *message, size_t length, char withBanner); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static Boolean debugger_attached() { BOOL debuggerAttached = NO; struct proc_bsdshortinfo info; @@ -715,7 +715,7 @@ static bool also_do_stderr(const _cf_logging_style style) { #if DEPLOYMENT_TARGET_LINUX // just log to stderr, other logging facilities are out result = true; -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#elif TARGET_OS_OSX || TARGET_OS_IPHONE if (style == _cf_logging_style_os_log) { // // This might seem a bit odd, so an explanation is in order: @@ -791,7 +791,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann int32_t minute = mine.tm_min; int32_t second = mine.tm_sec; int32_t ms = (int32_t)floor(1000.0 * modf(at, &dummy)); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%llu] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), tid); @@ -807,7 +807,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann } static void _logToStderr(char *banner, const char *message, size_t length) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE struct iovec v[3]; v[0].iov_base = banner; v[0].iov_len = banner ? strlen(banner) : 0; @@ -889,7 +889,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length _populateBanner(&banner, &time, &thread, &bannerLen); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" uid_t euid; @@ -921,7 +921,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(void *, const void *), CFStringRef (*contextDescFunc)(void *, const void *, const void *, bool, bool *), CFDictionaryRef formatOptions, int32_t lev, CFStringRef format, va_list args, _cf_logging_style loggingStyle) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE uintptr_t val = (uintptr_t)_CFGetTSD(__CFTSDKeyIsInCFLog); if (3 < val) return; // allow up to 4 nested invocations _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)(val + 1), NULL); @@ -947,7 +947,7 @@ static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(voi } if (buf) free(buf); if (str) CFRelease(str); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)val, NULL); #endif } @@ -1037,7 +1037,7 @@ void CFLog1(CFLogLevel lev, CFStringRef message) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE kern_return_t _CFDiscorporateMemoryAllocate(CFDiscorporateMemory *hm, size_t size, bool purgeable) { kern_return_t ret = KERN_SUCCESS; @@ -1090,14 +1090,14 @@ kern_return_t _CFDiscorporateMemoryMaterialize(CFDiscorporateMemory *hm) { #endif -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX static os_unfair_lock __CFProcessKillingLock = OS_UNFAIR_LOCK_INIT; static CFIndex __CFProcessKillingDisablingCount = 1; static Boolean __CFProcessKillingWasTurnedOn = false; #endif void _CFSuddenTerminationDisable(void) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX os_unfair_lock_lock(&__CFProcessKillingLock); __CFProcessKillingDisablingCount++; os_unfair_lock_unlock(&__CFProcessKillingLock); @@ -1107,7 +1107,7 @@ void _CFSuddenTerminationDisable(void) { } void _CFSuddenTerminationEnable(void) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX // In our model the first call of _CFSuddenTerminationEnable() that does not balance a previous call of _CFSuddenTerminationDisable() actually enables sudden termination so we have to keep a count that's almost redundant with vproc's. os_unfair_lock_lock(&__CFProcessKillingLock); __CFProcessKillingDisablingCount--; @@ -1122,7 +1122,7 @@ void _CFSuddenTerminationEnable(void) { } void _CFSuddenTerminationExitIfTerminationEnabled(int exitStatus) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX // This is for when the caller wants to try to exit quickly if possible but not automatically exit the process when it next becomes clean, because quitting might still be cancelled by the user. os_unfair_lock_lock(&__CFProcessKillingLock); os_unfair_lock_unlock(&__CFProcessKillingLock); @@ -1132,7 +1132,7 @@ void _CFSuddenTerminationExitIfTerminationEnabled(int exitStatus) { } void _CFSuddenTerminationExitWhenTerminationEnabled(int exitStatus) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX // The user has had their final opportunity to cancel quitting. Exit as soon as the process is clean. Same carefulness as in _CFSuddenTerminationExitIfTerminationEnabled(). os_unfair_lock_lock(&__CFProcessKillingLock); if (__CFProcessKillingWasTurnedOn) { @@ -1144,7 +1144,7 @@ void _CFSuddenTerminationExitWhenTerminationEnabled(int exitStatus) { } size_t _CFSuddenTerminationDisablingCount(void) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX return (__CFProcessKillingWasTurnedOn ? 0 : 1); #else // Elsewhere, sudden termination is always disabled @@ -1201,7 +1201,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (errorPtr) *errorPtr = _CFErrorWithFilePathCodeDomain(kCFErrorDomainPOSIX, errno, path); return false; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (uncached) (void)fcntl(fd, F_NOCACHE, 1); // Non-zero arg turns off caching; we ignore error as uncached is just a hint #endif if (fstat(fd, &statBuf) < 0) { @@ -1232,7 +1232,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (0LL == statBuf.st_size) { bytes = malloc(8); // don't return constant string -- it's freed! length = 0; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } else if (map) { if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) { int32_t savederrno = errno; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index dfb2e0f405..e5b362e8d1 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -45,7 +45,7 @@ extern "C" { #define pthread_set_qos_class_self_np(A, B) do {} while (0) #define pthread_override_qos_class_start_np(A, B, C) (NULL) #define pthread_override_qos_class_end_np(A) do {} while (0) -#elif (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#elif (TARGET_OS_OSX || TARGET_OS_IPHONE) #include #include #endif @@ -73,7 +73,7 @@ typedef char * Class; #define CRSetCrashLogMessage(A) do {} while (0) #define CRSetCrashLogMessage2(A) do {} while (0) -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #endif diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index 2a88e4d305..5998001d3d 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -50,12 +50,12 @@ CF_IMPLICIT_BRIDGING_DISABLED #include #elif TARGET_OS_BSD #include // malloc() -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#elif TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #endif -#if (INCLUDE_OBJC || DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT +#if (INCLUDE_OBJC || TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT #include #endif @@ -465,7 +465,7 @@ CF_EXPORT const void *_CFArrayCheckAndGetValueAtIndex(CFArrayRef array, CFIndex CF_EXPORT void _CFArrayReplaceValues(CFMutableArrayRef array, CFRange range, const void *_Nullable * _Nullable newValues, CFIndex newCount); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE /* Enumeration Call CFStartSearchPathEnumeration() once, then call CFGetNextSearchPathEnumeration() one or more times with the returned state. @@ -545,7 +545,7 @@ CF_EXPORT Boolean _CFRunLoopIsCurrent(CFRunLoopRef rl); CF_EXPORT CFIndex _CFStreamInstanceSize(void); CF_EXPORT CFReadStreamRef CFReadStreamCreateWithData(_Nullable CFAllocatorRef alloc, CFDataRef data); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE typedef struct { mach_vm_address_t address; mach_vm_size_t size; @@ -572,7 +572,7 @@ CF_CROSS_PLATFORM_EXPORT void _CFDataInit(CFMutableDataRef memory, CFOptionFlags CF_EXPORT CFRange _CFDataFindBytes(CFDataRef data, CFDataRef dataToFind, CFRange searchRange, CFDataSearchFlags compareOptions); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #if !defined(__CFReadTSR) #define __CFReadTSR() mach_absolute_time() #endif @@ -586,7 +586,7 @@ CF_INLINE UInt64 __CFReadTSR(void) { #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE /* Identical to CFStringGetFileSystemRepresentation, but returns additional information about the failure. */ diff --git a/CoreFoundation/CMakeLists.txt b/CoreFoundation/CMakeLists.txt index 49f5c1d6e5..c60aea03c8 100644 --- a/CoreFoundation/CMakeLists.txt +++ b/CoreFoundation/CMakeLists.txt @@ -343,10 +343,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android) PRIVATE -DHAVE_SCHED_GETAFFINITY) endif() -elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) - target_compile_definitions(CoreFoundation - PRIVATE - -DDEPLOYMENT_TARGET_MACOSX) elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) # NOTE(compnerd) we only support building with the dynamic CRT as using the # static CRT causes problems for users of the library. diff --git a/CoreFoundation/Collections.subproj/CFBasicHash.c b/CoreFoundation/Collections.subproj/CFBasicHash.c index 20d2097f8b..a585ffe886 100644 --- a/CoreFoundation/Collections.subproj/CFBasicHash.c +++ b/CoreFoundation/Collections.subproj/CFBasicHash.c @@ -20,7 +20,7 @@ #endif #include "CFOverflow.h" -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define __SetLastAllocationEventName(A, B) do { if (__CFOASafe && (A)) __CFSetLastAllocationEventName(A, B); } while (0) #else #define __SetLastAllocationEventName(A, B) do { } while (0) @@ -362,7 +362,7 @@ static inline void *CFBasicHashGetPtrAtIndex(int32_t i) __attribute__((no_saniti } CF_PRIVATE Boolean CFBasicHashHasStrongValues(CFConstBasicHashRef ht) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX return ht->bits.strong_values ? true : false; #else return false; @@ -370,7 +370,7 @@ CF_PRIVATE Boolean CFBasicHashHasStrongValues(CFConstBasicHashRef ht) { } CF_PRIVATE Boolean CFBasicHashHasStrongKeys(CFConstBasicHashRef ht) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX return ht->bits.strong_keys ? true : false; #else return false; @@ -378,7 +378,7 @@ CF_PRIVATE Boolean CFBasicHashHasStrongKeys(CFConstBasicHashRef ht) { } CF_INLINE Boolean __CFBasicHashHasHashCache(CFConstBasicHashRef ht) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX return ht->bits.hashes_offset ? true : false; #else return false; diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index a3ee2d8c23..edd40e6019 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -34,7 +34,7 @@ static Boolean _CFDataShouldBridgeToSwift(CFTypeID type, CFDataRef data); #define CFDATA_MAX_SIZE ((1ULL << 31) - 1) #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include CF_INLINE unsigned long __CFPageSize() { return vm_page_size; } #elif DEPLOYMENT_TARGET_WINDOWS diff --git a/CoreFoundation/Collections.subproj/CFStorage.c b/CoreFoundation/Collections.subproj/CFStorage.c index 07287e5bd0..664f544faf 100644 --- a/CoreFoundation/Collections.subproj/CFStorage.c +++ b/CoreFoundation/Collections.subproj/CFStorage.c @@ -1091,7 +1091,7 @@ CFStorageRef CFStorageCreate(CFAllocatorRef allocator, CFIndex valueSize) { storage->valueSize = valueSize; /* if valueSize is a power of 2, then set the shifter to the log base 2 of valueSize. Otherwise set it to NO_SHIFTER */ if (valueSize > 0 && !(valueSize & (valueSize - 1))) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE storage->byteToValueShifter = __builtin_ctzl(valueSize); #else CFIndex tempSize = valueSize; diff --git a/CoreFoundation/Collections.subproj/CFTree.c b/CoreFoundation/Collections.subproj/CFTree.c index de5ddeb1f1..0f87429973 100644 --- a/CoreFoundation/Collections.subproj/CFTree.c +++ b/CoreFoundation/Collections.subproj/CFTree.c @@ -88,7 +88,7 @@ static CFStringRef __CFTreeCopyDescription(CFTypeRef cf) { static void __CFTreeDeallocate(CFTypeRef cf) { CFTreeRef tree = (CFTreeRef)cf; const struct __CFTreeCallBacks *cb; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX CFTreeRemoveAllChildren(tree); #endif cb = __CFTreeGetCallBacks(tree); diff --git a/CoreFoundation/Error.subproj/CFError.c b/CoreFoundation/Error.subproj/CFError.c index 8a2f10de4a..7f1eadb22e 100644 --- a/CoreFoundation/Error.subproj/CFError.c +++ b/CoreFoundation/Error.subproj/CFError.c @@ -14,7 +14,7 @@ #include "CFRuntime_Internal.h" #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #endif @@ -250,7 +250,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { if (reason) { CFStringRef const backstopComboString = CFSTR("%@ %@"); CFStringRef comboString = backstopComboString; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (cfBundle) comboString = CFCopyLocalizedStringFromTableInBundle(CFSTR("%@ %@"), CFSTR("Error"), cfBundle, "Used for presenting the 'what failed' and 'why it failed' sections of an error message, where each one is one or more complete sentences. The first %@ corresponds to the 'what failed' (For instance 'The file could not be saved.') and the second one 'why it failed' (For instance 'The volume is out of space.')"); #endif @@ -265,7 +265,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS // Cache the CF bundle since we will be using it for localized strings. Note that for platforms without bundle support we also go this non-localized route. CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (!cfBundle) { // This should be rare, but has been observed in the wild, due to running out of file descriptors. Normally we might not go to such extremes, but since we want to be able to present reasonable errors even in the case of errors such as running out of file descriptors, why not. This is CFError after all. !!! Be sure to have the same logic here as below for going through various options for fetching the strings. @@ -281,7 +281,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } if (reasonOrDesc) CFRelease(reasonOrDesc); return result; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS } // Then look for kCFErrorLocalizedFailureReasonKey; if there, create a full sentence from that. @@ -495,7 +495,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR if (!errStr) return NULL; if (CFEqual(key, kCFErrorDescriptionKey)) return errStr; // If all we wanted was the non-localized description, we're done -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // We need a kCFErrorLocalizedFailureReasonKey, so look up a possible localization for the error message // Look for the bundle in /System/Library/CoreServices/CoreTypes.bundle CFArrayRef paths = CFCopySearchPathForDirectoriesInDomains(kCFLibraryDirectory, kCFSystemDomainMask, false); @@ -534,7 +534,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR return errStr; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE /* Built-in callback for Mach domain. */ static CFTypeRef _CFErrorMachCallBack(CFErrorRef err, CFStringRef key) CF_RETURNS_RETAINED { @@ -565,7 +565,7 @@ static void _CFErrorInitializeCallBackTable(void) { _CFErrorCallBackTable = table; // Register the known providers, going thru a special variant of the function that doesn't lock __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainPOSIX, _CFErrorPOSIXCallBack); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainMach, _CFErrorMachCallBack); #endif __CFUnlock(&_CFErrorSpinlock); diff --git a/CoreFoundation/Locale.subproj/CFDateFormatter.c b/CoreFoundation/Locale.subproj/CFDateFormatter.c index 648835c71f..7627896c83 100644 --- a/CoreFoundation/Locale.subproj/CFDateFormatter.c +++ b/CoreFoundation/Locale.subproj/CFDateFormatter.c @@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) { int32_t years = 0; __cficu_ucal_clear(calendar); @@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter } } } else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX __cficu_ucal_clear(cal); __cficu_ucal_set(cal, UCAL_ERA, 1); __cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status); diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index 82bdce4167..675372d3cd 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include @@ -298,7 +298,7 @@ static void _setCachedCurrentLocale(CFLocaleRef newLocale) { #define FALLBACK_LOCALE_NAME CFSTR("en_US") #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFStringRef _CFLocaleCopyLocaleIdentifierByAddingLikelySubtags(CFStringRef localeID) { CFStringRef result = NULL; @@ -526,7 +526,7 @@ CFStringRef _CFLocaleCreateLocaleIdentiferByReplacingLanguageCodeAndScriptCode(C } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray); /// Creates a new locale identifier by identifying the most preferred localization (using `availableLocalizations` and `preferredLanguages`) and then creating a locale based on the most preferred localization, while retaining any relevant attributes from `preferredLocaleID`, e.g. if `availableLocalizations` is `[ "en", "fr", "de" ]`, `preferredLanguages` is `[ "ar-AE", "en-AE" ]`, `preferredLocaleID` is `ar_AE@numbers=arab;calendar=islamic-civil`, it will return `en_AE@calendar=islamic-civil`, i.e. the language will be matched to `en` since that’s the only available localization that matches, `calendar` will be retained since it’s language-agnostic, but `numbers` will be discarded because the `arab` numbering system is not valid for `en`. @@ -585,7 +585,7 @@ static CFLocaleRef _CFLocaleCopyCurrentGuts(CFStringRef name, Boolean useCache, // things which call this function thousands or millions of times in // a short period. if (!name) { -#if 0 // DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if 0 // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX name = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication); #endif } else { @@ -806,7 +806,7 @@ CFStringRef CFLocaleGetIdentifier(CFLocaleRef locale) { } CFTypeRef CFLocaleGetValue(CFLocaleRef locale, CFStringRef key) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (!_CFExecutableLinkedOnOrAfter(CFSystemVersionSnowLeopard)) { // Hack for Opera, which is using the hard-coded string value below instead of // the perfectly good public kCFLocaleCountryCode constant, for whatever reason. @@ -891,7 +891,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C langPref = (CFArrayRef)CFDictionaryGetValue(displayLocale->_prefs, CFSTR("AppleLanguages")); if (langPref) CFRetain(langPref); } else { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX langPref = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); #endif } @@ -916,7 +916,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C } CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX int32_t locale, localeCount = uloc_countAvailable(); CFMutableSetRef working = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeSetCallBacks); for (locale = 0; locale < localeCount; ++locale) { @@ -937,7 +937,7 @@ CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static CFArrayRef __CFLocaleCopyCStringsAsArray(const char* const* p) { CFMutableArrayRef working = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); for (; *p; ++p) { @@ -977,7 +977,7 @@ static CFArrayRef __CFLocaleCopyUEnumerationAsArray(UEnumeration *enumer, UError #endif CFArrayRef CFLocaleCopyISOLanguageCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX const char* const* p = uloc_getISOLanguages(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -986,7 +986,7 @@ CFArrayRef CFLocaleCopyISOLanguageCodes(void) { } CFArrayRef CFLocaleCopyISOCountryCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX const char* const* p = uloc_getISOCountries(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -995,7 +995,7 @@ CFArrayRef CFLocaleCopyISOCountryCodes(void) { } CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_ALL, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1007,7 +1007,7 @@ CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { } CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_COMMON|UCURR_NON_DEPRECATED, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1019,7 +1019,7 @@ CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { } CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef allocator, uint32_t lcid) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char buffer[kMaxICUNameSize]; UErrorCode status = U_ZERO_ERROR; int32_t ret = uloc_getLocaleForLCID(lcid, buffer, kMaxICUNameSize, &status); @@ -1034,7 +1034,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef a } uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIdentifier) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringRef ident = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorSystemDefault, localeIdentifier); char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = ident ? CFStringGetCString(ident, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; @@ -1046,7 +1046,7 @@ uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIden } CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoLangCode) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1066,7 +1066,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoL } CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCode) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1086,7 +1086,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCo } _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE _CFLocaleCalendarDirection calendarDirection = _kCFLocaleCalendarDirectionLeftToRight; Boolean keyExistsAndHasValidFormat = false; Boolean calendarIsRightToLeft = CFPreferencesGetAppBooleanValue(CFSTR("NSLocaleCalendarDirectionIsRightToLeft"), kCFPreferencesAnyApplication, &keyExistsAndHasValidFormat); @@ -1118,7 +1118,7 @@ _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray) { CFMutableArrayRef newArray = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); if (languagesArray && (CFArrayGetTypeID() == CFGetTypeID(languagesArray))) { @@ -1138,7 +1138,7 @@ static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesA #endif CFArrayRef CFLocaleCopyPreferredLanguages(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFArrayRef languagesArray = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); CFArrayRef result = _CFLocaleCopyPreferredLanguagesFromPrefs(languagesArray); if (languagesArray) CFRelease(languagesArray); @@ -1180,7 +1180,7 @@ static bool __CFLocaleCopyCodes(CFLocaleRef locale, bool user, CFTypeRef *cf, CF return false; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { UErrorCode icuErr = U_ZERO_ERROR; CFMutableCharacterSetRef working = CFCharacterSetCreateMutable(NULL); @@ -1236,7 +1236,7 @@ CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { #endif static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1257,7 +1257,7 @@ static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1275,7 +1275,7 @@ static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyICUCalendarID(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1360,7 +1360,7 @@ static bool __CFLocaleCopyCalendarID(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (__CFLocaleCopyCalendarID(locale, user, cf, context)) { CFCalendarRef calendar = _CFCalendarCreateCoWWithIdentifier((CFStringRef)*cf); CFCalendarSetLocale(calendar, locale); @@ -1394,7 +1394,7 @@ static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, } static bool __CFLocaleCopyDelimiter(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX ULocaleDataDelimiterType type = (ULocaleDataDelimiterType)0; if (context == kCFLocaleQuotationBeginDelimiterKey) { type = ULOCDATA_QUOTATION_START; @@ -1465,7 +1465,7 @@ static bool __CFLocaleCopyCollatorID(CFLocaleRef locale, bool user, CFTypeRef *c return canonLocaleCFStr ? true : false; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE STATIC_CONST_STRING_DECL(_metricUnitsKey, "AppleMetricUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsKey, "AppleMeasurementUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsCentimeters, "Centimeters"); @@ -1496,7 +1496,7 @@ static void __CFLocaleGetPreferencesForMeasurementSystem(UMeasurementSystem meas } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) +#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && (TARGET_OS_OSX || TARGET_OS_IPHONE) static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, bool *outCelsius) { if (temperaturePref) { if (CFEqual(temperaturePref, kCFLocaleTemperatureUnitCelsius)) { @@ -1511,13 +1511,13 @@ static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE)) +#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && (TARGET_OS_OSX || TARGET_OS_IPHONE)) static CFStringRef _CFLocaleGetTemperatureUnitName(bool celsius) { return celsius? kCFLocaleTemperatureUnitCelsius: kCFLocaleTemperatureUnitFahrenheit; } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" @@ -1560,11 +1560,11 @@ static bool __CFLocaleGetMeasurementSystemForName(CFStringRef name, UMeasuremen #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UMeasurementSystem *outMeasurementSystem) { UMeasurementSystem output = UMS_SI; // Default is Metric bool done = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (user) { CFTypeRef metricPref = CFDictionaryGetValue(locale->_prefs, _metricUnitsKey); CFTypeRef measurementPref = CFDictionaryGetValue(locale->_prefs, _measurementUnitsKey); @@ -1590,7 +1590,7 @@ static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UM static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = system != UMS_US ? kCFBooleanTrue : kCFBooleanFalse; @@ -1602,7 +1602,7 @@ static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyMeasurementSystem(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = CFRetain(__CFLocaleGetMeasurementSystemName(system)); @@ -1619,13 +1619,13 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR #if U_ICU_VERSION_MAJOR_NUM > 54 bool celsius = true; // Default is Celsius bool done = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (user) { CFTypeRef temperatureUnitPref = CFDictionaryGetValue(locale->_prefs, _temperatureUnitKey); done = _CFLocaleGetTemperatureUnitForPreferences(temperatureUnitPref, &celsius); } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (!done) { char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1663,7 +1663,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterDecimalStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1679,7 +1679,7 @@ static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef // so we have to have another routine here which creates a Currency number formatter. static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterCurrencyStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1691,7 +1691,7 @@ static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef return false; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX typedef int32_t (*__CFICUFunction)(const char *, const char *, UChar *, int32_t, UErrorCode *); static bool __CFLocaleICUName(const char *locale, const char *valLocale, CFStringRef *out, __CFICUFunction icu) { @@ -1763,7 +1763,7 @@ static bool __CFLocaleICUCurrencyName(const char *locale, const char *value, UCu #endif static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX UErrorCode icuStatus = U_ZERO_ERROR; int32_t size; UChar name[kMaxICUNameSize]; @@ -1796,7 +1796,7 @@ static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRe } static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUName(locale, value, out, uloc_getDisplayLanguage); #else *out = CFRetain(CFSTR("(none)")); @@ -1805,7 +1805,7 @@ static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStri } static bool __CFLocaleCountryName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) < sizeof(lid) - 3) { @@ -1821,7 +1821,7 @@ static bool __CFLocaleCountryName(const char *locale, const char *value, CFStrin } static bool __CFLocaleScriptName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) == 4) { @@ -1838,7 +1838,7 @@ static bool __CFLocaleScriptName(const char *locale, const char *value, CFString } static bool __CFLocaleVariantName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (strlen(value) < sizeof(lid) - 6) { @@ -1854,7 +1854,7 @@ static bool __CFLocaleVariantName(const char *locale, const char *value, CFStrin } static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCalendarKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1863,7 +1863,7 @@ static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStri } static bool __CFLocaleCollationName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCollationKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1872,7 +1872,7 @@ static bool __CFLocaleCollationName(const char *locale, const char *value, CFStr } static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_SYMBOL_NAME, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1881,7 +1881,7 @@ static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, C } static bool __CFLocaleCurrencyFullName(const char *locale, const char *value, CFStringRef *out) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_LONG_NAME, out); #else *out = CFRetain(CFSTR("(none)")); diff --git a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c index 4b22c1159e..fbd222b973 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c +++ b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c @@ -58,7 +58,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include #else #define ULOC_KEYWORD_SEPARATOR '@' @@ -1155,7 +1155,7 @@ enum { }; */ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX struct LocaleToLegacyCodes { const char * locale; // reduced to language plus one other component (script, region, variant), separators normalized to'_' @@ -1593,7 +1593,7 @@ static void _UpdateFullLocaleString(char inLocaleString[], int locStringMaxLen, // If so, copy the keywords to varKeyValueString and delete the variant tag // from the original string (but don't otherwise use the ICU canonicalization). varKeyValueString[0] = 0; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (variantTag) { UErrorCode icuStatus; int icuCanonStringLen; @@ -1720,7 +1720,7 @@ static void _GetKeyValueString(char inLocaleString[], char keyValueString[]) { } static void _AppendKeyValueString(char inLocaleString[], int locStringMaxLen, char keyValueString[]) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (keyValueString[0] != 0) { UErrorCode uerr = U_ZERO_ERROR; UEnumeration * uenum = uloc_openKeywords(keyValueString, &uerr); @@ -1952,12 +1952,12 @@ SPI: CFLocaleGetLanguageRegionEncodingForLocaleIdentifier gets the appropriate preferred localization in the current context (this function returns NO for a NULL localeIdentifier); and in this function langCode, regCode, and scriptCode are all SInt16* (not SInt32* like the equivalent parameters in CFBundleGetLocalizationInfoForLocalization). */ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ); #endif Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeIdentifier, LangCode *langCode, RegionCode *regCode, ScriptCode *scriptCode, CFStringEncoding *stringEncoding) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX Boolean returnValue = false; CFStringRef canonicalIdentifier = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, localeIdentifier); if (canonicalIdentifier) { @@ -2035,7 +2035,7 @@ Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeI #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ) { const char * localeString1 = ((const LocaleToLegacyCodes *)entry1)->locale; const char * localeString2 = ((const LocaleToLegacyCodes *)entry2)->locale; @@ -2045,7 +2045,7 @@ static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *en CFDictionaryRef CFLocaleCreateComponentsFromLocaleIdentifier(CFAllocatorRef allocator, CFStringRef localeID) { CFMutableDictionaryRef working = CFDictionaryCreateMutable(allocator, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX char cLocaleID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; char buffer[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -2175,7 +2175,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato free(variant); free(buf1); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX for (CFIndex idx = 0; idx < cnt; idx++) { if (keys[idx]) { char *key = __CStringFromString(keys[idx]); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index eb91845eb6..ef21e1b1af 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -26,7 +26,7 @@ #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -111,7 +111,7 @@ CFAbsoluteTime CFAbsoluteTimeGetCurrent(void) { #if DEPLOYMENT_RUNTIME_SWIFT CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { CFDateGetTypeID(); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE uint64_t tsr = mach_absolute_time(); return (CFTimeInterval)((double)tsr * __CF1_TSRRate); #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD @@ -164,7 +164,7 @@ const CFRuntimeClass __CFDateClass = { }; CF_PRIVATE void __CFDateInitialize(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE struct mach_timebase_info info; mach_timebase_info(&info); __CFTSRRate = (1.0E9 / (double)info.numer) * (double)info.denom; @@ -360,7 +360,7 @@ CFAbsoluteTime CFGregorianDateGetAbsoluteTime(CFGregorianDate gdate, CFTimeZoneR CFAbsoluteTime at; at = 86400.0 * __CFAbsoluteFromYMD(gdate.year - 2001, gdate.month, gdate.day); at += 3600.0 * gdate.hour + 60.0 * gdate.minute + gdate.second; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -379,7 +379,7 @@ CFGregorianDate CFAbsoluteTimeGetGregorianDate(CFAbsoluteTime at, CFTimeZoneRef int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -407,7 +407,7 @@ CFAbsoluteTime CFAbsoluteTimeAddGregorianUnits(CFAbsoluteTime at, CFTimeZoneRef CFAbsoluteTime candidate_at0, candidate_at1; uint8_t monthdays; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -526,7 +526,7 @@ CFGregorianUnits CFAbsoluteTimeGetDifferenceAsGregorianUnits(CFAbsoluteTime at1, SInt32 CFAbsoluteTimeGetDayOfWeek(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -542,7 +542,7 @@ SInt32 CFAbsoluteTimeGetDayOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { CFAbsoluteTime fixedat; int64_t absolute, year; int8_t month, day; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -561,7 +561,7 @@ SInt32 CFAbsoluteTimeGetWeekOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index 07e7f7ca9e..435c37ec52 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -180,7 +180,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define BITSFORDOUBLEZERO doubleZeroBits.bits #define BITSFORDOUBLEONE doubleOneBits.bits -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L diff --git a/CoreFoundation/Parsing.subproj/CFBinaryPList.c b/CoreFoundation/Parsing.subproj/CFBinaryPList.c index 5bc2358acc..8714620aba 100644 --- a/CoreFoundation/Parsing.subproj/CFBinaryPList.c +++ b/CoreFoundation/Parsing.subproj/CFBinaryPList.c @@ -568,7 +568,7 @@ CF_PRIVATE CFIndex __CFBinaryPlistWriteOrPresize(CFPropertyListRef plist, CFType const CFSetCallBacks setCallbacks = {0, __CFTypeCollectionRetain, __CFTypeCollectionRelease, 0, 0, 0}; uniquingset = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &setCallbacks); -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX _CFDictionarySetCapacity(objtable, estimate ? estimate : 650); _CFArraySetCapacity(objlist, estimate ? estimate : 650); _CFSetSetCapacity(uniquingset, estimate ? estimate : 1000); diff --git a/CoreFoundation/Parsing.subproj/CFPropertyList.c b/CoreFoundation/Parsing.subproj/CFPropertyList.c index f68ee1e62a..3362b3d10a 100644 --- a/CoreFoundation/Parsing.subproj/CFPropertyList.c +++ b/CoreFoundation/Parsing.subproj/CFPropertyList.c @@ -2320,7 +2320,7 @@ static CFStringEncoding encodingForXMLData(CFDataRef data, CFErrorRef *error, CF if (len == 5 && (*base == 'u' || *base == 'U') && (base[1] == 't' || base[1] == 'T') && (base[2] == 'f' || base[2] == 'F') && (base[3] == '-') && (base[4] == '8')) return kCFStringEncodingUTF8; encodingName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, base, len, kCFStringEncodingISOLatin1, false); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringEncoding enc = CFStringConvertIANACharSetNameToEncoding(encodingName); if (enc != kCFStringEncodingInvalidId) { CFRelease(encodingName); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/CoreFoundation/PlugIn.subproj/CFBundle.c index 319f95c5e6..29e4c9f72d 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle.c @@ -39,7 +39,7 @@ #endif #endif /* BINARY_SUPPORT_DLFCN */ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #elif DEPLOYMENT_TARGET_WINDOWS #include @@ -200,7 +200,7 @@ CF_PRIVATE os_log_t _CFBundleLocalizedStringLogger(void) { #pragma mark - -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX // Some apps may rely on the fact that CFBundle used to allow bundle objects to be deallocated (despite handing out unretained pointers via CFBundleGetBundleWithIdentifier or CFBundleGetAllBundles). To remain compatible even in the face of unsafe behavior, we can optionally use unsafe-unretained memory management for holding on to bundles. static Boolean _useUnsafeUnretainedTables(void) { return false; @@ -220,7 +220,7 @@ static void _CFBundleAddToTables(CFBundleRef bundle) { // Add to the _allBundles list if (!_allBundles) { CFArrayCallBacks callbacks = kCFTypeArrayCallBacks; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (_useUnsafeUnretainedTables()) { callbacks.retain = NULL; callbacks.release = NULL; @@ -279,7 +279,7 @@ static void _CFBundleAddToTables(CFBundleRef bundle) { static void _CFBundleRemoveFromTables(CFBundleRef bundle, CFURLRef bundleURL, CFStringRef bundleID) { // Since we no longer allow bundles to be removed from tables, this method does nothing. Modifying the tables during deallocation is risky because if the caller has over-released the bundle object then we will deadlock on the global lock. -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (_useUnsafeUnretainedTables()) { // Except for special cases of unsafe-unretained, where we must clean up the table or risk handing out a zombie object. There may still be outstanding pointers to these bundes (e.g. the result of CFBundleGetBundleWithIdentifier) but there is nothing we can do about that after this point. @@ -512,7 +512,7 @@ CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } result = _CFBundleGetFromTables(bundleID); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); @@ -762,7 +762,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL, bundle->_sharesStringsFiles = false; bundle->_isUnique = unique; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (!__CFgetenv("CFBundleDisableStringsSharing") && (strncmp(buff, "/System/Library/Frameworks", 26) == 0) && (strncmp(buff + strlen(buff) - 10, ".framework", 10) == 0)) bundle->_sharesStringsFiles = true; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c index df16a4d5fe..a691c93304 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c @@ -500,7 +500,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) retval = false; if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE retval = dlopen_preflight(buff); #endif if (!retval && error) { @@ -519,7 +519,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) if (hasSuitableArch) { uint32_t mainFlags = 0; if (_CFBundleGrokObjCImageInfoFromMainExecutable(NULL, &mainFlags) && (mainFlags & 0x2) != 0) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE uint32_t bundleFlags = 0; if (_CFBundleGetObjCImageInfo(bundle, NULL, &bundleFlags) && (bundleFlags & 0x2) == 0) hasRuntimeMismatch = true; #endif diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h index 15c97fe9c7..c6d81d4a6b 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h +++ b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h @@ -12,7 +12,7 @@ CF_EXTERN_C_BEGIN -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX #define BINARY_SUPPORT_DYLD 1 #define BINARY_SUPPORT_DLFCN 1 #if DEPLOYMENT_RUNTIME_SWIFT diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index b829b2fc01..f0979eefe1 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -89,7 +89,7 @@ static CFURLRef _CFBundleCopyExecutableURLRaw(CFURLRef urlPath, CFStringRef exeN } } } -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#elif TARGET_OS_OSX || TARGET_OS_IPHONE const uint8_t *image_suffix = (uint8_t *)__CFgetenvIfNotRestricted("DYLD_IMAGE_SUFFIX"); if (image_suffix) { diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c index 94db44d105..615b17c441 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c @@ -970,7 +970,7 @@ CF_PRIVATE CFArrayRef _CFBundleCopyArchitecturesForExecutable(CFURLRef url) { return result; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static Boolean _CFBundleGetObjCImageInfoForExecutable(CFURLRef url, uint32_t *objcVersion, uint32_t *objcFlags) { Boolean retval = false; (void)_CFBundleGrokFileType(url, NULL, NULL, NULL, NULL, NULL, &retval, objcVersion, objcFlags); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Locale.c b/CoreFoundation/PlugIn.subproj/CFBundle_Locale.c index dfd633aa38..2a1a47b4b9 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Locale.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Locale.c @@ -341,7 +341,7 @@ CF_EXPORT Boolean CFBundleGetLocalizationInfoForLocalization(CFStringRef localiz CFStringRef CFBundleCopyLocalizationForLocalizationInfo(SInt32 languageCode, SInt32 regionCode, SInt32 scriptCode, CFStringEncoding stringEncoding) { CFStringRef localizationName = NULL; if (!localizationName) localizationName = _CFBundleCopyLocaleAbbreviationForRegionCode(regionCode); -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (!localizationName && 0 <= languageCode && languageCode < SHRT_MAX) localizationName = CFLocaleCreateCanonicalLocaleIdentifierFromScriptManagerCodes(kCFAllocatorSystemDefault, (LangCode)languageCode, (RegionCode)-1); #endif if (!localizationName) localizationName = _CFBundleCopyLanguageAbbreviationForLanguageCode(languageCode); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index 167092f335..3287c2f77b 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -25,7 +25,7 @@ #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #if !TARGET_OS_ANDROID #include @@ -172,7 +172,7 @@ CF_EXPORT CFArrayRef CFBundleCopyResourceURLsOfTypeInDirectory(CFURLRef bundleUR #pragma mark - -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || DEPLOYMENT_TARGET_WINDOWS CF_INLINE Boolean _CFBundleURLHasSubDir(CFURLRef url, CFStringRef subDirName) { Boolean isDir = false, result = false; CFURLRef dirURL = CFURLCreateWithString(kCFAllocatorSystemDefault, subDirName, url); @@ -257,7 +257,7 @@ CF_PRIVATE uint8_t _CFBundleGetBundleVersionForURL(CFURLRef url) { } } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || DEPLOYMENT_TARGET_WINDOWS // Do a more substantial check for the subdirectories that make up version 0/1/2 bundles. These are sometimes symlinks (like in Frameworks) and they would have been missed by our check above. // n.b. that the readdir above may return DT_UNKNOWN, for example, when the directory is on a network mount. if (foundUnknown && localVersion == 3) { @@ -286,7 +286,7 @@ CF_EXPORT CFArrayRef _CFBundleGetSupportedPlatforms(CFBundleRef bundle) { } CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX return CFSTR("MacOS"); #elif TARGET_OS_IPHONE return CFSTR("iPhoneOS"); @@ -310,7 +310,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { } CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE return CFSTR("MacOS"); #elif DEPLOYMENT_TARGET_WINDOWS return CFSTR("Windows"); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Strings.c b/CoreFoundation/PlugIn.subproj/CFBundle_Strings.c index 3671837a05..7599957310 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Strings.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Strings.c @@ -11,7 +11,7 @@ #include "CFBundle_Internal.h" #include "CFCollections_Internal.h" -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX #endif diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c index 076865a8c3..0ffc018baa 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c @@ -17,7 +17,7 @@ static CFMutableDictionaryRef _bundlesByIdentifier = NULL; static CFMutableDictionaryRef _bundlesByURL = NULL; static CFMutableArrayRef _allBundles = NULL; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX // Some apps may rely on the fact that CFBundle used to allow bundle objects to be deallocated (despite handing out unretained pointers via CFBundleGetBundleWithIdentifier or CFBundleGetAllBundles). To remain compatible even in the face of unsafe behavior, we can optionally use unsafe-unretained memory management for holding on to bundles. static Boolean _useUnsafeUnretainedTables(void) { return false; @@ -34,7 +34,7 @@ static void _CFBundleAddToTables(CFBundleRef bundle, Boolean alreadyLocked) { // Add to the _allBundles list if (!_allBundles) { CFArrayCallBacks callbacks = kCFTypeArrayCallBacks; -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (_useUnsafeUnretainedTables()) { callbacks.retain = NULL; callbacks.release = NULL; @@ -89,7 +89,7 @@ static void _CFBundleAddToTables(CFBundleRef bundle, Boolean alreadyLocked) { static void _CFBundleRemoveFromTables(CFBundleRef bundle, CFURLRef bundleURL, CFStringRef bundleID) { // Since we no longer allow bundles to be removed from tables, this method does nothing. Modifying the tables during deallocation is risky because if the caller has over-released the bundle object then we will deadlock on the global lock. -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX if (_useUnsafeUnretainedTables()) { // Except for special cases of unsafe-unretained, where we must clean up the table or risk handing out a zombie object. There may still be outstanding pointers to these bundes (e.g. the result of CFBundleGetBundleWithIdentifier) but there is nothing we can do about that after this point. @@ -178,7 +178,7 @@ CF_EXPORT CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } _CFMutexLock(&CFBundleGlobalDataLock); result = _CFBundlePrimitiveGetBundleWithIdentifierAlreadyLocked(bundleID); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); diff --git a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c index e2e7d285da..e702e54125 100644 --- a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c +++ b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c @@ -17,7 +17,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #endif diff --git a/CoreFoundation/RunLoop.subproj/CFMessagePort.c b/CoreFoundation/RunLoop.subproj/CFMessagePort.c index cf743bc0a3..ab4d3de686 100644 --- a/CoreFoundation/RunLoop.subproj/CFMessagePort.c +++ b/CoreFoundation/RunLoop.subproj/CFMessagePort.c @@ -28,7 +28,7 @@ #include #if __HAS_DISPATCH__ #include -#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) && __has_include() +#if (TARGET_OS_OSX || TARGET_OS_IPHONE) && __has_include() #include #endif #endif diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index f9bc80e681..58d00be062 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -48,7 +48,7 @@ CF_INLINE uint64_t check_uint64_add(uint64_t x, uint64_t y, int32_t* err) { }; #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS #define USE_DISPATCH_SOURCE_FOR_TIMERS __HAS_DISPATCH__ #define USE_MK_TIMER_TOO 1 #else @@ -81,7 +81,7 @@ typedef HANDLE dispatch_runloop_handle_t; #endif #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_SIMULATOR +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_SIMULATOR #include #include #include @@ -225,7 +225,7 @@ static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; // In order to reuse most of the code across Mach and Windows v1 RunLoopSources, we define a // simple abstraction layer spanning Mach ports and Windows HANDLES -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE uint32_t __CFGetProcessPortCount(void) { ipc_info_space_t info; @@ -1645,7 +1645,7 @@ CF_EXPORT CFTypeRef _CFRunLoopGet2b(CFRunLoopRef rl) { return rl->_counterpart; } -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX void _CFRunLoopSetCurrent(CFRunLoopRef rl) { if (pthread_main_np()) return; CFRunLoopRef currentLoop = _CFRunLoopGetButDontCreateCurrent(); @@ -1960,7 +1960,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( void *info) __attribute__((noinline)); static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE void *(*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info), mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply, #else @@ -1968,7 +1968,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( #endif void *info) { if (perform) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE *reply = perform(msg, size, kCFAllocatorSystemDefault, info); #else perform(info); @@ -2053,7 +2053,7 @@ CF_INLINE void __CFRunLoopDebugInfoForRunLoopSource(CFRunLoopSourceRef rls) { } // msg, size and reply are unused on Windows -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) __attribute__((noinline)); static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) @@ -2079,7 +2079,7 @@ static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRun void *info = rls->_context.version1.info; cf_trace(KDEBUG_EVENT_CFRL_IS_CALLING_SOURCE1 | DBG_FUNC_START, rl, rlm, perform, info); __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__(perform, -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE msg, size, reply, #endif info); @@ -2450,7 +2450,7 @@ CF_EXPORT Boolean _CFRunLoopFinished(CFRunLoopRef rl, CFStringRef modeName) { static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInterval seconds, Boolean stopAfterHandle, CFRunLoopModeRef previousMode) __attribute__((noinline)); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define TIMEOUT_INFINITY (~(mach_msg_timeout_t)0) @@ -2742,12 +2742,12 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter Boolean didDispatchPortLastTime = true; int32_t retVal = 0; do { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE voucher_mach_msg_state_t voucherState = VOUCHER_MACH_MSG_STATE_UNCHANGED; voucher_t voucherCopy = NULL; #endif uint8_t msg_buffer[3 * 1024]; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE mach_msg_header_t *msg = NULL; mach_port_t livePort = MACH_PORT_NULL; #elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN @@ -2779,7 +2779,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #if __HAS_DISPATCH__ if (MACH_PORT_NULL != dispatchPort && !didDispatchPortLastTime) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE msg = (mach_msg_header_t *)msg_buffer; if (__CFRunLoopServiceMachPort(dispatchPort, &msg, sizeof(msg_buffer), &livePort, 0, &voucherState, NULL, rl, rlm)) { goto handle_msg; @@ -2814,7 +2814,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter CFAbsoluteTime sleepStart = poll ? 0.0 : CFAbsoluteTimeGetCurrent(); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #if USE_DISPATCH_SOURCE_FOR_TIMERS do { msg = (mach_msg_header_t *)msg_buffer; @@ -2974,7 +2974,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter // Despite the name, this works for windows handles as well CFRunLoopSourceRef rls = __CFRunLoopModeFindSourceForMachPort(rl, rlm, livePort); if (rls) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE mach_msg_header_t *reply = NULL; sourceHandledThisLoop = __CFRunLoopDoSource1(rl, rlm, rls, msg, msg->msgh_size, &reply) || sourceHandledThisLoop; if (NULL != reply) { @@ -2992,7 +2992,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter /* --- BLOCKS --- */ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (msg && msg != (mach_msg_header_t *)msg_buffer) free(msg); #endif @@ -3114,7 +3114,7 @@ void CFRunLoopWakeUp(CFRunLoopRef rl) { __CFRunLoopUnlock(rl); return; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE kern_return_t ret; /* We unconditionally try to send the message, since we don't want * to lose a wakeup, but the send may fail if there is already a @@ -3717,7 +3717,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL void *addr = rls->_context.version0.version == 0 ? (void *)rls->_context.version0.perform : (rls->_context.version0.version == 1 ? (void *)rls->_context.version1.perform : NULL); #if DEPLOYMENT_TARGET_WINDOWS contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %p}"), rls->_context.version0.version, rls->_context.version0.info, addr); -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %s (%p)}"), rls->_context.version0.version, rls->_context.version0.info, name, addr); @@ -3916,7 +3916,7 @@ static CFStringRef __CFRunLoopObserverCopyDescription(CFTypeRef cf) { /* DOES CA } #if DEPLOYMENT_TARGET_WINDOWS result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{valid = %s, activities = 0x%x, repeats = %s, order = %d, callout = %p, context = %@}"), cf, CFGetAllocator(rlo), __CFIsValid(rlo) ? "Yes" : "No", rlo->_activities, __CFRunLoopObserverRepeats(rlo) ? "Yes" : "No", rlo->_order, rlo->_callout, contextDesc); -#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) void *addr = rlo->_callout; Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; @@ -4370,7 +4370,7 @@ void CFRunLoopTimerGetContext(CFRunLoopTimerRef rlt, CFRunLoopTimerContext *cont } CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), CFTimeInterval, (NSTimer *)rlt, tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); @@ -4381,7 +4381,7 @@ CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { } void CFRunLoopTimerSetTolerance(CFRunLoopTimerRef rlt, CFTimeInterval tolerance) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), void, (NSTimer *)rlt, setTolerance:tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 84ce0a1a1a..9e4897713b 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -937,7 +937,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #include #include @@ -1029,7 +1029,7 @@ static void timeradd(struct timeval *a, struct timeval *b, struct timeval *res) static _CFThreadRef __cfSocketTid() { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); @@ -1117,7 +1117,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define INVALID_SOCKET (CFSocketNativeHandle)(-1) #define closesocket(a) close((a)) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) @@ -1349,7 +1349,7 @@ CF_INLINE Boolean __CFSocketFdClr(CFSocketNativeHandle sock, CFMutableDataRef fd } static SInt32 __CFSocketCreateWakeupSocketPair(void) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE SInt32 error; error = socketpair(PF_LOCAL, SOCK_DGRAM, 0, __CFWakeupSocketPair); @@ -2447,7 +2447,7 @@ static CFStringRef __CFSocketCopyDescription(CFTypeRef cf) { result = CFStringCreateMutable(CFGetAllocator(s), 0); __CFSocketLock(s); void *addr = s->_callout; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; #else @@ -2508,7 +2508,7 @@ const CFRuntimeClass __CFSocketClass = { CFTypeID CFSocketGetTypeID(void) { static dispatch_once_t initOnce; dispatch_once(&initOnce, ^{ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE struct rlimit lim1; int ret1 = getrlimit(RLIMIT_NOFILE, &lim1); int mib[] = {CTL_KERN, KERN_MAXFILESPERPROC}; @@ -2615,13 +2615,13 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN if (INVALID_SOCKET != sock) CFDictionaryAddValue(__CFAllSockets, (void *)(uintptr_t)sock, memory); if (NULL == __CFSocketManagerThread) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD _CFThreadRef tid = 0; pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif pthread_create(&tid, &attr, __CFSocketManager, 0); @@ -3269,7 +3269,7 @@ CFSocketError CFSocketSetAddress(CFSocketRef s, CFDataRef address) { if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // Verify that the namelen is correct. If not, we have to fix it up. Developers will often incorrectly use 0 or strlen(path). See 9217961 and the second half of 9098274. // Max size is a size byte, plus family byte, plus path of 255, plus a null byte. char newName[255]; @@ -3321,7 +3321,7 @@ CFSocketError CFSocketConnectToAddress(CFSocketRef s, CFDataRef address, CFTimeI if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE SInt32 flags = fcntl(sock, F_GETFL, 0); if (flags >= 0) wasBlocking = ((flags & O_NONBLOCK) == 0); if (wasBlocking && (timeout > 0.0 || timeout < 0.0)) ioctlsocket(sock, FIONBIO, (u_long *)&yes); @@ -3383,7 +3383,7 @@ CFSocketRef CFSocketCreate(CFAllocatorRef allocator, SInt32 protocolFamily, SInt if (0 >= protocol && SOCK_STREAM == socketType) protocol = IPPROTO_TCP; if (0 >= protocol && SOCK_DGRAM == socketType) protocol = IPPROTO_UDP; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (PF_LOCAL == protocolFamily && 0 >= socketType) socketType = SOCK_STREAM; #endif #if DEPLOYMENT_TARGET_WINDOWS @@ -3470,7 +3470,7 @@ static void __CFSocketSendNameRegistryRequest(CFSocketSignature *signature, CFDi static void __CFSocketValidateSignature(const CFSocketSignature *providedSignature, CFSocketSignature *signature, uint16_t defaultPortNumber) { struct sockaddr_in sain, *sainp; memset(&sain, 0, sizeof(sain)); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; @@ -3496,7 +3496,7 @@ static void __CFSocketValidateSignature(const CFSocketSignature *providedSignatu } else { sainp = (struct sockaddr_in *)CFDataGetBytePtr(providedSignature->address); if ((int)sizeof(struct sockaddr_in) <= CFDataGetLength(providedSignature->address) && (AF_INET == sainp->sin_family || 0 == sainp->sin_family)) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; diff --git a/CoreFoundation/Stream.subproj/CFConcreteStreams.c b/CoreFoundation/Stream.subproj/CFConcreteStreams.c index 0a80d52ab5..0a665a50b1 100644 --- a/CoreFoundation/Stream.subproj/CFConcreteStreams.c +++ b/CoreFoundation/Stream.subproj/CFConcreteStreams.c @@ -18,7 +18,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #include #endif @@ -49,7 +49,7 @@ typedef struct { CONST_STRING_DECL(kCFStreamPropertyFileCurrentOffset, "kCFStreamPropertyFileCurrentOffset"); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CONST_STRING_DECL(_kCFStreamPropertyFileNativeHandle, "_kCFStreamPropertyFileNativeHandle"); #endif CONST_STRING_DECL(_kCFStreamPropertyHTTPTrailer, "_kCFStreamPropertyHTTPTrailer"); @@ -442,7 +442,7 @@ static CFTypeRef fileCopyProperty(struct _CFStream *stream, CFStringRef property if (fileStream->offset != -1) { result = CFNumberCreate(CFGetAllocator((CFTypeRef)stream), kCFNumberSInt64Type, &(fileStream->offset)); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE } else if (CFEqual(propertyName, _kCFStreamPropertyFileNativeHandle)) { int fd = fileStream->fd; if (fd != -1) { diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 15b1fd8890..fb57939b60 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -19,7 +19,7 @@ #include #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // On Mach these live in CF for historical reasons, even though they are declared in CFNetwork const int kCFStreamErrorDomainSSL = 3; @@ -109,7 +109,7 @@ static struct { #define CFNETWORK_CALL(sym, args) ((CFNetworkSupport.sym)args) -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define CFNETWORK_LOAD_SYM(sym) __CFLookupCFNetworkFunction(#sym) #elif DEPLOYMENT_TARGET_WINDOWS #define CFNETWORK_LOAD_SYM(sym) (void *)GetProcAddress(CFNetworkSupport.image, #sym) @@ -118,7 +118,7 @@ static struct { static void initializeCFNetworkSupport(void) { __CFBitSet(CFNetworkSupport.flags, kTriedToLoad); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CFNetworkSupport._CFSocketStreamCreatePair = CFNETWORK_LOAD_SYM(_CFSocketStreamCreatePair); CFNetworkSupport._CFErrorCreateWithStreamError = CFNETWORK_LOAD_SYM(_CFErrorCreateWithStreamError); CFNetworkSupport._CFStreamErrorFromCFError = CFNETWORK_LOAD_SYM(_CFStreamErrorFromCFError); diff --git a/CoreFoundation/Stream.subproj/CFStream.c b/CoreFoundation/Stream.subproj/CFStream.c index 56ef74c63d..305de44c37 100644 --- a/CoreFoundation/Stream.subproj/CFStream.c +++ b/CoreFoundation/Stream.subproj/CFStream.c @@ -1742,7 +1742,7 @@ static CFRunLoopRef _legacyStreamRunLoop() pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif _CFThreadRef workThread; diff --git a/CoreFoundation/String.subproj/CFBurstTrie.c b/CoreFoundation/String.subproj/CFBurstTrie.c index 6ea9071557..0d5f4103a9 100644 --- a/CoreFoundation/String.subproj/CFBurstTrie.c +++ b/CoreFoundation/String.subproj/CFBurstTrie.c @@ -18,7 +18,7 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX #include #include #include diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index 4cab25ac91..c00f8294e3 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -27,14 +27,14 @@ #include "CFString_Internal.h" #include "CFRuntime_Internal.h" #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include "CFLocaleInternal.h" #include "CFStringLocalizedFormattingInternal.h" #endif #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #endif @@ -103,7 +103,7 @@ static void __CFRecordStringAllocationEvent(const char *encoding, const char *by } #endif //INSTRUMENT_SHARED_STRINGS -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE extern size_t malloc_good_size(size_t size); #endif extern void __CFStrConvertBytesToUnicode(const uint8_t *bytes, UniChar *buffer, CFIndex numChars); @@ -414,7 +414,7 @@ static CFStringEncoding __CFDefaultFileSystemEncoding = kCFStringEncodingInvalid CFStringEncoding __CFDefaultEightBitStringEncoding = kCFStringEncodingInvalidId; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define __defaultEncoding kCFStringEncodingMacRoman #elif DEPLOYMENT_TARGET_LINUX #define __defaultEncoding kCFStringEncodingUTF8 @@ -443,7 +443,7 @@ CF_INLINE CFStringEncoding __CFStringGetSystemEncoding(void) { CFStringEncoding CFStringFileSystemEncoding(void) { if (__CFDefaultFileSystemEncoding == kCFStringEncodingInvalidId) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS __CFDefaultFileSystemEncoding = kCFStringEncodingUTF8; #else __CFDefaultFileSystemEncoding = CFStringGetSystemEncoding(); @@ -645,7 +645,7 @@ CF_INLINE CFIndex __CFStrNewCapacity(CFMutableStringRef str, unsigned long reqCa } if (__CFStrHasContentsAllocator(str)) { /* Also apply any preferred size from the allocator */ newCapacity = CFAllocatorGetPreferredSizeForSize(__CFStrContentsAllocator(str), newCapacity, 0); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE } else { newCapacity = malloc_good_size(newCapacity); #endif @@ -4657,7 +4657,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (((encoding & 0x0FFF) == kCFStringEncodingUnicode) && ((encoding == kCFStringEncodingUnicode) || ((encoding > kCFStringEncodingUTF8) && (encoding <= kCFStringEncodingUTF32LE)))) { guessedByteLength = (length + 1) * ((((encoding >> 26) & 2) == 0) ? sizeof(UTF16Char) : sizeof(UTF32Char)); // UTF32 format has the bit set } else if (((guessedByteLength = CFStringGetMaximumSizeForEncoding(length, encoding)) > length) && !CF_IS_OBJC(_kCFRuntimeIDCFString, string) && !CF_IS_SWIFT(_kCFRuntimeIDCFString, string)) { // Multi byte encoding -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD if (__CFStrIsUnicode(string)) { CFIndex aLength = CFStringEncodingByteLengthForCharacters(encoding, kCFStringEncodingPrependBOM, __CFStrContents(string), __CFStrLength(string)); if (aLength > 0) guessedByteLength = aLength; @@ -4671,7 +4671,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (guessedByteLength == length && __CFStrIsEightBit(string) && __CFStringEncodingIsSupersetOfASCII(encoding)) { // It's all ASCII !! return CFDataCreate(alloc, ((uint8_t *)__CFStrContents(string) + __CFStrSkipAnyLengthByte(string)), __CFStrLength(string)); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD } #endif } @@ -6500,7 +6500,7 @@ reswtch:switch (ch) { // Length of the buffer to call sprintf() with #define BUFFER_LEN 512 -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define SNPRINTF(TYPE, WHAT) { \ TYPE value = (TYPE) WHAT; \ if (-1 != specs[curSpec].widthArgNum) { \ @@ -6740,7 +6740,7 @@ static CFIndex __CFStringValidateFormat(CFStringRef expected, CFStringRef untrus if (!verified) { if (errorPtr) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS CFStringRef debugMsg = CFStringCreateWithFormat(tmpAlloc, NULL, CFSTR("Format '%@' does not match expected '%@'"), untrustedFormat, expected); CFMutableDictionaryRef userInfo = CFDictionaryCreateMutable(tmpAlloc, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(userInfo, kCFErrorDebugDescriptionKey, debugMsg); @@ -7186,7 +7186,7 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr } // See if we need to localize the decimal point if (formatOptions) { // We have localization info -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringRef decimalSeparator = (CFGetTypeID(formatOptions) == CFLocaleGetTypeID()) ? (CFStringRef)CFLocaleGetValue((CFLocaleRef)formatOptions, kCFLocaleDecimalSeparatorKey) : (CFStringRef)CFDictionaryGetValue(formatOptions, CFSTR("NSDecimalSeparator")); #else CFStringRef decimalSeparator = CFSTR("."); diff --git a/CoreFoundation/String.subproj/CFStringEncodings.c b/CoreFoundation/String.subproj/CFStringEncodings.c index 57db72ed30..9d01ab21b3 100644 --- a/CoreFoundation/String.subproj/CFStringEncodings.c +++ b/CoreFoundation/String.subproj/CFStringEncodings.c @@ -809,7 +809,7 @@ CFIndex CFStringGetMaximumSizeOfFileSystemRepresentation(CFStringRef string) { } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithErrorStatus(CFStringRef string, char *buffer, CFIndex maxBufLen, CFIndex *characterIndex) { #define MAX_STACK_BUFFER_LEN (255) const UTF16Char *characters = CFStringGetCharactersPtr(string); @@ -892,7 +892,7 @@ _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithE #endif Boolean CFStringGetFileSystemRepresentation(CFStringRef string, char *buffer, CFIndex maxBufLen) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE return _CFStringGetFileSystemRepresentationWithErrorStatus(string, buffer, maxBufLen, NULL) == _kCFStringFileSystemRepresentationErrorNone; #else return CFStringGetCString(string, buffer, maxBufLen, CFStringFileSystemEncoding()); diff --git a/CoreFoundation/String.subproj/CFStringUtilities.c b/CoreFoundation/String.subproj/CFStringUtilities.c index 3acfb67195..3e519d6ffa 100644 --- a/CoreFoundation/String.subproj/CFStringUtilities.c +++ b/CoreFoundation/String.subproj/CFStringUtilities.c @@ -17,7 +17,7 @@ #include "CFICUConverters.h" #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX #include #include #endif @@ -110,7 +110,7 @@ CFStringEncoding CFStringConvertIANACharSetNameToEncoding(CFStringRef charsetNam encoding = __CFStringEncodingGetFromCanonicalName(name); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingInvalidId == encoding) encoding = __CFStringEncodingGetFromICUName(name); #endif @@ -258,7 +258,7 @@ CFStringEncoding CFStringGetMostCompatibleMacStringEncoding(CFStringEncoding enc #define kCFStringCompareAllocationIncrement (128) -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX // ------------------------------------------------------------------------------------------------- // CompareSpecials - ignore case & diacritic differences @@ -420,7 +420,7 @@ static UCollator *__CFStringCopyDefaultCollator(CFLocaleRef compareLocale) { return collator; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static void __collatorFinalize(UCollator *collator) { CFLocaleRef locale = _CFGetTSD(__CFTSDKeyCollatorLocale); _CFSetTSD(__CFTSDKeyCollatorUCollator, NULL, NULL); @@ -526,7 +526,7 @@ static OSStatus __CompareTextDefault(UCollator *collator, CFOptionFlags options, return 0; // noErr } -#endif // DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#endif // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static inline CFIndex __extendLocationBackward(CFIndex location, CFStringInlineBuffer *str, const uint8_t *nonBaseBMP, const uint8_t *punctBMP) { while (location > 0) { @@ -570,7 +570,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * CFRange range1 = str1Range; CFRange range2 = str2Range; SInt32 order; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX Boolean isEqual; bool forcedOrdering = ((options & kCFCompareForcedOrdering) ? true : false); @@ -604,8 +604,8 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range2.location = __extendLocationBackward(range2.location - 1, str2, nonBaseBMP, punctBMP); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE // First we try to use the last one used on this thread, if the locale is the same, // otherwise we try to check out a default one, or then we create one. UCollator *threadCollator = _CFGetTSD(__CFTSDKeyCollatorUCollator); @@ -620,7 +620,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * collator = __CFStringCreateCollator((CFLocaleRef)compareLocale); defaultCollator = false; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE } #endif #endif @@ -632,7 +632,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range1.length = (str1Range.location + str1Range.length) - range1.location; range2.length = (str2Range.location + str2Range.length) - range2.location; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { compResult = ((isEqual && !forcedOrdering) ? kCFCompareEqualTo : ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan)); } else @@ -702,7 +702,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { if (isEqual) { if (forcedOrdering && (kCFCompareEqualTo == compResult) && (0 != order)) compResult = ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan); @@ -739,7 +739,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * if (buffer2Len > 0) CFAllocatorDeallocate(kCFAllocatorSystemDefault, buffer2); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (collator == threadCollator) { // do nothing, already cached } else { diff --git a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c index 5170215dc1..1d6cd280c3 100644 --- a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c @@ -220,7 +220,7 @@ static CFIndex __CFStringEncodingConverterReleaseICUConverter(UConverter *conver #define MAX_BUFFER_SIZE (1000) -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #if 0 // we're no longer doing this check. Revive when the status in the bug changed. #if (U_ICU_VERSION_MAJOR_NUM > 49) diff --git a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c index a6791a62f3..81190cea35 100644 --- a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c @@ -27,7 +27,7 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX static const CFStringEncodingConverter __CFICUBootstrap = { .toBytes.standard = NULL, @@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert if (__CFIsPlatformConverterAvailable(encoding)) { return &__CFPlatformBootstrap; } else { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (__CFStringEncodingGetICUName(encoding)) { return &__CFICUBootstrap; } @@ -74,7 +74,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CF_PRIVATE CFStringEncoding *__CFStringEncodingCreateListOfAvailablePlatformConverters(CFAllocatorRef allocator, CFIndex *numberOfConverters) { return NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index 750c2140cb..037662c41e 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper; break; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX case kCFStringEncodingConverterICU: converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding); break; @@ -599,7 +599,7 @@ static const _CFEncodingConverter *__CFGetConverter(uint32_t encoding) { case kCFStringEncodingUTF8: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[0]); break; /* the swith here should avoid possible bootstrap issues in the default: case below when invoked from CFStringGetSystemEncoding() */ -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX case kCFStringEncodingMacRoman: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[1]); break; #elif DEPLOYMENT_TARGET_WINDOWS case kCFStringEncodingWindowsLatin1: commonConverterSlot = (const _CFEncodingConverter **)(&(commonConverters[1])); break; @@ -696,7 +696,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen); #endif @@ -825,7 +825,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const if (!converter) return kCFStringEncodingConverterUnavailable; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen); #endif @@ -869,7 +869,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_ const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes); #endif @@ -913,7 +913,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars); #endif @@ -998,7 +998,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void if (NULL == encodings) { CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings; CFIndex numICUConverters = 0, numPlatformConverters = 0; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters); #else CFStringEncoding *icuConverters = NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c index a8bfcd9970..a09da654fb 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c @@ -568,7 +568,7 @@ CF_PRIVATE CFStringEncoding __CFStringEncodingGetFromCanonicalName(const char *c } #undef LENGTH_LIMIT -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX // This list indexes from DOS range static uint16_t const __CFISO8859SimilarScriptList[] = { kCFStringEncodingMacRoman, @@ -777,10 +777,10 @@ static const char * const __CFOtherNameList[] = { "Western (NextStep)", "Western (EBCDIC Latin 1)", }; -#endif /* DEPLOYMENT_TARGET_MACOSX */ +#endif /* TARGET_OS_OSX */ CF_PRIVATE CFStringEncoding __CFStringEncodingGetMostCompatibleMacScript(CFStringEncoding encoding) { -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX switch (encoding & 0x0F00) { case 0: return encoding & 0xFF; break; // Mac scripts @@ -799,7 +799,7 @@ CF_PRIVATE CFStringEncoding __CFStringEncodingGetMostCompatibleMacScript(CFStrin } } } -#endif /* DEPLOYMENT_TARGET_MACOSX */ +#endif /* TARGET_OS_OSX */ return kCFStringEncodingInvalidId; } @@ -817,7 +817,7 @@ CF_PRIVATE const char *__CFStringEncodingGetName(CFStringEncoding encoding) { case kCFStringEncodingUTF7: return "Unicode (UTF-7)"; break; } -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX if (0x0200 == (encoding & 0x0F00)) { encoding &= 0x00FF; @@ -827,7 +827,7 @@ CF_PRIVATE const char *__CFStringEncodingGetName(CFStringEncoding encoding) { if (kCFNotFound != index) return __CFOtherNameList[index]; } -#endif /* DEPLOYMENT_TARGET_MACOSX */ +#endif /* TARGET_OS_OSX */ return NULL; } diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index e4e2a0fe93..9a15aa3bda 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -15,7 +15,7 @@ #include "CFStringEncodingConverterExt.h" #include "CFUnicodeDecomposition.h" #include "CFUniCharPriv.h" -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -24,7 +24,7 @@ #include #include #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #include #endif @@ -32,7 +32,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define __kCFCharacterSetDir "/System/Library/CoreServices" #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" @@ -40,7 +40,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE #define USE_MACHO_SEGMENT 1 #elif DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) #define USE_RAW_SYMBOL 1 @@ -56,7 +56,7 @@ enum { CF_INLINE uint32_t __CFUniCharMapExternalSetToInternalIndex(uint32_t cset) { return ((kCFUniCharFirstInternalSet <= cset) ? ((cset - kCFUniCharFirstInternalSet) + kCFUniCharLastExternalSet) : cset) - kCFUniCharFirstBitmapSet; } CF_INLINE uint32_t __CFUniCharMapCompatibilitySetID(uint32_t cset) { return ((cset == kCFUniCharControlCharacterSet) ? kCFUniCharControlAndFormatterCharacterSet : (((cset > kCFUniCharLastExternalSet) && (cset < kCFUniCharFirstInternalSet)) ? ((cset - kCFUniCharLastExternalSet) + kCFUniCharFirstInternalSet) : cset)); } -#if (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE) && USE_MACHO_SEGMENT +#if (TARGET_OS_OSX || TARGET_OS_IPHONE) && USE_MACHO_SEGMENT #include #include #include @@ -107,14 +107,14 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, // Memory map the file -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); @@ -171,7 +171,7 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { #elif DEPLOYMENT_TARGET_WINDOWS static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { @@ -238,7 +238,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #endif // USE_MACHO_SEGMENT -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if !defined(CF_UNICHAR_BITMAP_FILE) #if USE_MACHO_SEGMENT #define CF_UNICHAR_BITMAP_FILE "__csbitmaps" @@ -254,7 +254,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -286,7 +286,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -308,7 +308,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICODE_DATA_SYM __CFUnicodeDataL #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_MACHO_SEGMENT *bytes = __CFGetSectDataPtr("__UNICODE", bitmapName, NULL); diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index 83ec538552..f30e3510b5 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -20,8 +20,8 @@ #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX -#if DEPLOYMENT_TARGET_MACOSX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX #include #endif #include @@ -52,7 +52,7 @@ static CFStringRef POSIXPathToURLPath(CFStringRef path, CFAllocatorRef alloc, Bo static CFStringRef CreateStringFromFileSystemRepresentationByAddingPercentEscapes(CFAllocatorRef alloc, const UInt8 *bytes, CFIndex numBytes, Boolean isDirectory, Boolean isAbsolute, Boolean windowsPath, Boolean *addedPercentEncoding) CF_RETURNS_RETAINED; CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLRef anURL, CFURLPathStyle fsType, Boolean resolveAgainstBase) CF_RETURNS_RETAINED; CF_EXPORT CFURLRef _CFURLCreateCurrentDirectoryURL(CFAllocatorRef allocator) CF_RETURNS_RETAINED; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static Boolean _CFURLHasFileURLScheme(CFURLRef url, Boolean *hasScheme); #endif @@ -66,7 +66,7 @@ static CONST_STRING_DECL(kCFURLHTTPSScheme, "https") static CONST_STRING_DECL(kCFURLFileScheme, "file") static CONST_STRING_DECL(kCFURLDataScheme, "data") static CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE static CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #else @@ -75,7 +75,7 @@ CONST_STRING_DECL(kCFURLHTTPSScheme, "https") CONST_STRING_DECL(kCFURLFileScheme, "file") CONST_STRING_DECL(kCFURLDataScheme, "data") CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #endif @@ -2262,7 +2262,7 @@ static CFURLRef _CFURLCreateWithFileSystemRepresentation(CFAllocatorRef allocato #endif struct __CFURL *result = NULL; if (bufLen > 0) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX Boolean isAbsolute = bufLen && (*buffer == '/'); Boolean addedPercentEncoding; Boolean releaseBaseURL = false; @@ -2348,7 +2348,7 @@ CFURLRef _CFURLCopyFileURL(CFURLRef url) { struct __CFURL *result = NULL; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE // make sure we have a CFURL since this might be a subclassed NSURL url = _CFURLFromNSURL(url); __CFGenericValidateType(url, CFURLGetTypeID()); @@ -2841,7 +2841,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { uint8_t numberOfRanges; const CFRange *baseRanges; Boolean baseIsObjC; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE Boolean filePathURLCreated = false; #endif @@ -2858,7 +2858,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { if (!base) { return (CFURLRef)CFRetain(relativeURL); } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE else if ( CFURLIsFileReferenceURL(base) && !CFURLHasDirectoryPath(base) ) { // 16695827 - If the base URL is a file reference URL which doesn't end with a slash, we have to convert it to a file path URL before we can make it absolute. base = CFURLCreateFilePathURL(alloc, base, NULL); @@ -2895,7 +2895,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { #endif } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( filePathURLCreated ) { CFRelease(base); } @@ -4045,7 +4045,7 @@ static CFStringRef URLPathToPOSIXPath(CFStringRef path, CFAllocatorRef allocator return result; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str, UInt8 *inBuffer, CFIndex inBufferLen) { size_t fileURLPrefixLength; @@ -4371,7 +4371,7 @@ CF_EXPORT CFStringRef CFURLCopyFileSystemPath(CFURLRef anURL, CFURLPathStyle pat CFStringRef result = NULL; CFAllocatorRef alloc = CFGetAllocator(anURL); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX Boolean isCanonicalFileURL = false; if ( (pathStyle == kCFURLPOSIXPathStyle) && (CFURLGetBaseURL(anURL) == NULL) ) { @@ -4402,9 +4402,9 @@ CF_EXPORT CFStringRef CFURLCopyFileSystemPath(CFURLRef anURL, CFURLPathStyle pat // fall back to slower way. result = CFURLCreateStringWithFileSystemPath(alloc, anURL, pathStyle, false); } -#else // !DEPLOYMENT_TARGET_MACOSX +#else // !TARGET_OS_OSX result = CFURLCreateStringWithFileSystemPath(alloc, anURL, pathStyle, false); -#endif // !DEPLOYMENT_TARGET_MACOSX +#endif // !TARGET_OS_OSX return ( result ); } @@ -4515,13 +4515,13 @@ CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLR } Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, uint8_t *buffer, CFIndex bufLen) { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS CFAllocatorRef alloc = CFGetAllocator(url); CFStringRef path; if (!url) return false; #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX if ( !resolveAgainstBase || (CFURLGetBaseURL(url) == NULL) ) { if (!CF_IS_OBJC(CFURLGetTypeID(), url)) { // We can access the ivars @@ -4655,7 +4655,7 @@ CFStringRef CFURLCopyLastPathComponent(CFURLRef url) { } } else { Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(CFGetAllocator(url), url, NULL); @@ -4784,7 +4784,7 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe CFAssert1(pathComponent != NULL, __kCFLogAssertion, "%s(): Cannot be called with a NULL component to append", __PRETTY_FUNCTION__); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL if possible (only because this is appending a path component) CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4848,7 +4848,7 @@ CFURLRef CFURLCreateCopyDeletingLastPathComponent(CFAllocatorRef allocator, CFUR __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4930,7 +4930,7 @@ CFURLRef CFURLCreateCopyAppendingPathExtension(CFAllocatorRef allocator, CFURLRe __CFGenericValidateType(extension, CFStringGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4991,7 +4991,7 @@ CFURLRef CFURLCreateCopyDeletingPathExtension(CFAllocatorRef allocator, CFURLRef __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -5134,7 +5134,7 @@ CFURLRef _CFURLCreateFromPropertyListRepresentation(CFAllocatorRef alloc, CFProp return url; } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE Boolean _CFURLIsFileReferenceURL(CFURLRef url) { return ( CFURLIsFileReferenceURL(url) ); @@ -5160,7 +5160,7 @@ Boolean CFURLIsFileReferenceURL(CFURLRef url) } #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE CFURLRef CFURLCreateFilePathURL(CFAllocatorRef alloc, CFURLRef url, CFErrorRef *error) { diff --git a/CoreFoundation/URL.subproj/CFURL.inc.h b/CoreFoundation/URL.subproj/CFURL.inc.h index fdcc41fea1..a3d3db90d8 100644 --- a/CoreFoundation/URL.subproj/CFURL.inc.h +++ b/CoreFoundation/URL.subproj/CFURL.inc.h @@ -244,7 +244,7 @@ break; } } -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE if (pathRg.length > 6 && characterArray[pathRg.location] == '/' && characterArray[pathRg.location + 1] == '.' && characterArray[pathRg.location + 2] == 'f' && characterArray[pathRg.location + 3] == 'i' && characterArray[pathRg.location + 4] == 'l' && characterArray[pathRg.location + 5] == 'e' && characterArray[pathRg.location + 6] == '/') { flags |= PATH_HAS_FILE_ID; } else if (!sawPercent) { diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index 31bd8fb854..a7b73e42d1 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -24,7 +24,7 @@ CFData read/write routines #include #include #include -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #include #include #include @@ -41,11 +41,11 @@ CFData read/write routines #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS +#if TARGET_OS_OSX || TARGET_OS_IOS #include #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE DEFINE_WEAK_CFNETWORK_FUNC_FAIL(Boolean, _CFURLCreateDataAndPropertiesFromResource, (CFAllocatorRef A, CFURLRef B, CFDataRef *C, CFDictionaryRef *D, CFArrayRef E, SInt32 *F), (A, B, C, D, E, F), { if(C) *C=NULL; if (D) *D=NULL; if(F) *F=kCFURLImproperArgumentsError; }, false) @@ -233,7 +233,7 @@ static Boolean _CFFileURLWritePropertiesToResource(CFURLRef url, CFDictionaryRef CFNumberRef modeNum = (CFNumberRef)value; CFNumberGetValue(modeNum, kCFNumberSInt32Type, &mode); } else { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD #define MODE_TYPE mode_t #elif DEPLOYMENT_TARGET_WINDOWS #define MODE_TYPE uint16_t @@ -712,7 +712,7 @@ Boolean CFURLCreateDataAndPropertiesFromResource(CFAllocatorRef alloc, CFURLRef } else if (CFStringCompare(scheme, CFSTR("data"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { result = _CFDataURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode); } else { -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE result = __CFNetwork__CFURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, fetchedProperties, desiredProperties, errorCode); #else if (fetchedData) *fetchedData = NULL; @@ -779,7 +779,7 @@ Boolean CFURLWriteDataAndPropertiesToResource(CFURLRef url, CFDataRef data, CFDi return success; } else { CFRelease(scheme); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE Boolean result = __CFNetwork__CFURLWriteDataAndPropertiesToResource(url, data, propertyDict, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; @@ -825,7 +825,7 @@ Boolean CFURLDestroyResource(CFURLRef url, SInt32 *errorCode) { } } else { CFRelease(scheme); -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_OSX || TARGET_OS_IPHONE Boolean result = __CFNetwork__CFURLDestroyResource(url, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; diff --git a/CoreFoundation/build.py b/CoreFoundation/build.py index a07f1d9ad1..05315e17ef 100755 --- a/CoreFoundation/build.py +++ b/CoreFoundation/build.py @@ -21,7 +21,6 @@ cf.CFLAGS = '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' cf.LDFLAGS = '' elif Configuration.current.target.sdk == OSType.MacOSX: - cf.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX ' cf.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r ' elif Configuration.current.target.sdk == OSType.Win32 and Configuration.current.target.environ == EnvironmentType.Cygnus: cf.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -mcmodel=large ' diff --git a/Docs/Design.md b/Docs/Design.md index cad1157abb..93e2bd6a22 100644 --- a/Docs/Design.md +++ b/Docs/Design.md @@ -124,5 +124,5 @@ Parts of the CoreFoundation and Foundation libraries are as old as macOS (or old There are some additional considerations when working on the CoreFoundation part of our code, both because it is written in C and also because it is shared amongst platforms. * Surround Swift-runtime-specific code with the standard macro `#if DEPLOYMENT_RUNTIME_SWIFT`. -* Surround platform-specific code with our standard macros `DEPLOYMENT_TARGET_MACOSX`, `TARGET_OS_IPHONE` (all iOS platforms and derivatives), `DEPLOYMENT_TARGET_LINUX`. +* Surround platform-specific code with our standard macros `TARGET_OS_OSX`, `TARGET_OS_IPHONE` (all iOS platforms and derivatives), `DEPLOYMENT_TARGET_LINUX`. * Follow the coding style of the .c file that you are working in. diff --git a/Foundation.xcodeproj/project.pbxproj b/Foundation.xcodeproj/project.pbxproj index 5155324471..e3595b042a 100644 --- a/Foundation.xcodeproj/project.pbxproj +++ b/Foundation.xcodeproj/project.pbxproj @@ -2897,7 +2897,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; OTHER_CFLAGS = ( "-DCF_BUILDING_CF", - "-DDEPLOYMENT_TARGET_MACOSX", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", @@ -2971,7 +2970,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; OTHER_CFLAGS = ( "-DCF_BUILDING_CF", - "-DDEPLOYMENT_TARGET_MACOSX", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", @@ -3032,7 +3030,6 @@ HEADER_SEARCH_PATHS = /usr/include/libxml2; OTHER_CFLAGS = ( "-DCF_BUILDING_CF", - "-DDEPLOYMENT_TARGET_MACOSX", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-I$(SRCROOT)/bootstrap/common/usr/include", @@ -3074,7 +3071,6 @@ HEADER_SEARCH_PATHS = /usr/include/libxml2; OTHER_CFLAGS = ( "-DCF_BUILDING_CF", - "-DDEPLOYMENT_TARGET_MACOSX", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-I$(SRCROOT)/bootstrap/common/usr/include", diff --git a/build.py b/build.py index 39157622ae..710abc9b4b 100755 --- a/build.py +++ b/build.py @@ -22,7 +22,6 @@ foundation.CFLAGS = '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include/curl ' foundation.LDFLAGS = '' elif Configuration.current.target.sdk == OSType.MacOSX: - foundation.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX ' foundation.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CoreFoundation/CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r ' elif Configuration.current.target.sdk == OSType.Win32 and Configuration.current.target.environ == EnvironmentType.Cygnus: foundation.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -mcmodel=large ' From 08b260e89eaf3a24087fdfc0dbb4e61232810c88 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 10:28:54 -0700 Subject: [PATCH 06/10] DEPLOYMENT_TARGET_LINUX -> TARGET_OS_LINUX --- CMakeLists.txt | 1 - CoreFoundation/Base.subproj/CFFileUtilities.c | 12 ++-- CoreFoundation/Base.subproj/CFInternal.h | 8 +-- CoreFoundation/Base.subproj/CFPlatform.c | 26 +++---- CoreFoundation/Base.subproj/CFRuntime.c | 8 +-- CoreFoundation/Base.subproj/CFUUID.c | 2 +- CoreFoundation/Base.subproj/CFUtilities.c | 14 ++-- .../Base.subproj/CoreFoundation_Prefix.h | 8 +-- .../Base.subproj/ForFoundationOnly.h | 2 +- CoreFoundation/CMakeLists.txt | 1 - CoreFoundation/Collections.subproj/CFData.c | 2 +- .../Locale.subproj/CFDateFormatter.c | 4 +- CoreFoundation/Locale.subproj/CFLocale.c | 72 +++++++++---------- .../Locale.subproj/CFLocaleIdentifier.c | 18 ++--- CoreFoundation/Locale.subproj/CFLocaleKeys.c | 2 +- CoreFoundation/NumberDate.subproj/CFDate.c | 18 ++--- CoreFoundation/NumberDate.subproj/CFNumber.c | 2 +- .../Parsing.subproj/CFPropertyList.c | 2 +- .../PlugIn.subproj/CFBundle_BinaryTypes.h | 2 +- .../PlugIn.subproj/CFBundle_Executable.c | 10 +-- .../PlugIn.subproj/CFBundle_Resources.c | 6 +- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 30 ++++---- CoreFoundation/RunLoop.subproj/CFSocket.c | 4 +- .../Stream.subproj/CFConcreteStreams.c | 2 +- CoreFoundation/Stream.subproj/CFStream.c | 2 +- CoreFoundation/String.subproj/CFBurstTrie.c | 2 +- CoreFoundation/String.subproj/CFString.c | 12 ++-- .../String.subproj/CFStringUtilities.c | 16 ++--- .../CFPlatformConverters.c | 4 +- .../CFStringEncodingConverter.c | 14 ++-- .../CFStringEncodingDatabase.c | 6 +- .../StringEncodings.subproj/CFUniChar.c | 20 +++--- CoreFoundation/URL.subproj/CFURL.c | 12 ++-- CoreFoundation/URL.subproj/CFURL.inc.h | 2 +- CoreFoundation/URL.subproj/CFURLAccess.c | 4 +- CoreFoundation/build.py | 4 +- Docs/Design.md | 2 +- build.py | 4 +- 38 files changed, 179 insertions(+), 181 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a45467d4b2..cecfdc9f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,6 @@ if(FOUNDATION_ENABLE_LIBDISPATCH) endif() if(CMAKE_SYSTEM_NAME STREQUAL Android OR CMAKE_SYSTEM_NAME STREQUAL Linux) - set(deployment_target -DDEPLOYMENT_TARGET_LINUX) set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN") set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR}) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index 1c2b8da7de..b66e3f1134 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, FindClose(handle); pathBuf[pathLength] = '\0'; -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD uint8_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -452,13 +452,13 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, isDir = ((statBuf.st_mode & S_IFMT) == S_IFDIR); } } -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, namelen, isDir, dirURL); #else fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, dp->d_namlen, isDir, dirURL); #endif } else { -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase (alloc, (uint8_t *)dp->d_name, namelen, false, dirURL); #else fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase (alloc, (uint8_t *)dp->d_name, dp->d_namlen, false, dirURL); @@ -545,7 +545,7 @@ CF_PRIVATE SInt32 _CFGetPathProperties(CFAllocatorRef alloc, char *path, Boolean if (modTime != NULL) { if (fileExists) { -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX struct timespec ts = {statBuf.st_mtime, 0}; #else struct timespec ts = statBuf.st_mtimespec; @@ -1072,7 +1072,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla struct dirent *dent; if ((dirp = opendir(directoryPathBuf))) { while ((dent = readdir(dirp))) { -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX CFIndex nameLen = strlen(dent->d_name); if (dent->d_type == DT_UNKNOWN) { // on some old file systems readdir may always fill d_type as DT_UNKNOWN (0), double check with stat @@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla if (dent->d_type == DT_DIR) { isDirectory = true; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD else if (dent->d_type == DT_UNKNOWN) { // We need to do an additional stat on this to see if it's really a directory or not. // This path should be uncommon. diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index c65caab653..c1d17a9c5f 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -428,7 +428,7 @@ CF_EXPORT void * __CFConstantStringClassReferencePtr; #if DEPLOYMENT_RUNTIME_SWIFT && TARGET_OS_MAC -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #define CONST_STRING_SECTION __attribute__((section(".cfstr.data"))) #else #define CONST_STRING_SECTION @@ -543,7 +543,7 @@ CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) { return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0); } -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD typedef int32_t CFLock_t; #define CFLockInit 0 @@ -971,7 +971,7 @@ CF_EXPORT bool _NS_pthread_equal(_CFThreadRef t1, _CFThreadRef t2); #endif -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #define pthread_main_np _CFIsMainThread #endif @@ -1026,7 +1026,7 @@ enum { }; #endif -#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS #define QOS_CLASS_USER_INITIATED DISPATCH_QUEUE_PRIORITY_HIGH #define QOS_CLASS_DEFAULT DISPATCH_QUEUE_PRIORITY_DEFAULT #define QOS_CLASS_UTILITY DISPATCH_QUEUE_PRIORITY_LOW diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index a4433a7338..ba4fc4fe05 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -161,7 +161,7 @@ const char *_CFProcessPath(void) { } #endif -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #include #if __has_include() #include @@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) { } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #include #include @@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) { CF_EXPORT CFStringRef CFCopyUserName(void) { CFStringRef result = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD uid_t euid; __CFGetUGIDs(&euid, NULL); struct passwd *upwd = getpwuid(euid ? euid : getuid()); @@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); #elif DEPLOYMENT_TARGET_WINDOWS CFURLRef retVal = NULL; @@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD if (!uName) { return _CFCopyHomeDirURLForUser(NULL, true); } else { @@ -614,7 +614,7 @@ CF_PRIVATE void __CFTSDInitialize() { static void __CFTSDSetSpecific(void *arg) { #if TARGET_OS_OSX || TARGET_OS_IPHONE pthread_setspecific(__CFTSDIndexKey, arg); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX pthread_setspecific(__CFTSDIndexKey, arg); #elif DEPLOYMENT_TARGET_WINDOWS FlsSetValue(__CFTSDIndexKey, arg); @@ -624,7 +624,7 @@ static void __CFTSDSetSpecific(void *arg) { static void *__CFTSDGetSpecific() { #if TARGET_OS_OSX || TARGET_OS_IPHONE return pthread_getspecific(__CFTSDIndexKey); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX return pthread_getspecific(__CFTSDIndexKey); #elif DEPLOYMENT_TARGET_WINDOWS return FlsGetValue(__CFTSDIndexKey); @@ -1182,7 +1182,7 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) { #pragma mark - #pragma mark Linux OSAtomic -#if defined(DEPLOYMENT_TARGET_LINUX) || TARGET_OS_BSD +#if TARGET_OS_LINUX || TARGET_OS_BSD bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst) { @@ -1237,7 +1237,7 @@ void OSMemoryBarrier() { __sync_synchronize(); } -#endif // DEPLOYMENT_TARGET_LINUX +#endif // TARGET_OS_LINUX #pragma mark - #pragma mark Dispatch Replacements @@ -1348,7 +1348,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) { #pragma mark - #pragma mark Windows and Linux Helpers -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include @@ -1483,7 +1483,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ } return 0; -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX return pthread_setname_np(thread, name); #endif } @@ -1491,7 +1491,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { #if TARGET_OS_OSX || TARGET_OS_IPHONE return pthread_getname_np(pthread_self(), buf, length); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX return pthread_getname_np(pthread_self(), buf, length); #endif return -1; @@ -1516,7 +1516,7 @@ int _CFOpenFile(const char *path, int opts) { } CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) { -#if TARGET_OS_WIN32 || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX void *mem = realloc(ptr, size); if (mem == NULL && ptr != NULL && size != 0) { free(ptr); diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index cfd0eb0f9b..97d91704d4 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -50,7 +50,7 @@ __kCFRetainEvent = 28, __kCFReleaseEvent = 29 }; -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include #elif TARGET_OS_BSD #include // malloc() @@ -406,7 +406,7 @@ CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const ch #if TARGET_OS_OSX || TARGET_OS_IPHONE memory = malloc_zone_memalign(malloc_default_zone(), align, size); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX int result = posix_memalign((void **)&memory, /*alignment*/ align, size); int error = errno; enum { errorStringBufferLength = 64 }; @@ -1094,7 +1094,7 @@ Boolean __CFInitialized = 0; // move the next 2 lines down into the #if below, and make it static, after Foundation gets off this symbol on other platforms. CF_EXPORT _CFThreadRef _CFMainPThread; _CFThreadRef _CFMainPThread = kNilPthreadT; -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CF_EXPORT _CFThreadRef _CF_pthread_main_thread_np(void); _CFThreadRef _CF_pthread_main_thread_np(void) { @@ -1106,7 +1106,7 @@ _CFThreadRef _CF_pthread_main_thread_np(void) { -#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_LINUX || TARGET_OS_BSD static void __CFInitialize(void) __attribute__ ((constructor)); static #endif diff --git a/CoreFoundation/Base.subproj/CFUUID.c b/CoreFoundation/Base.subproj/CFUUID.c index e4dde69733..058387756c 100644 --- a/CoreFoundation/Base.subproj/CFUUID.c +++ b/CoreFoundation/Base.subproj/CFUUID.c @@ -151,7 +151,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) { long rStatus = UuidCreate(&u); if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1; memmove(&bytes, &u, sizeof(bytes)); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX static Boolean useV1UUIDs = false, checked = false; uuid_t uuid; if (!checked) { diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index a02c5b4ab4..3301413c5c 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -59,7 +59,7 @@ #include #endif -#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_LINUX || TARGET_OS_BSD #include #include #endif @@ -71,7 +71,7 @@ #include #endif -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #ifdef HAVE_SCHED_GETAFFINITY #include #endif @@ -448,7 +448,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { if (result != 0) { pcnt = 0; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #ifdef HAVE_SCHED_GETAFFINITY cpu_set_t set; @@ -475,7 +475,7 @@ CF_PRIVATE CFIndex __CFProcessorCount() { if (result != 0) { pcnt = 0; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX pcnt = sysconf(_SC_NPROCESSORS_CONF); #else // Assume the worst @@ -493,7 +493,7 @@ CF_PRIVATE uint64_t __CFMemorySize() { if (result != 0) { memsize = 0; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX memsize = sysconf(_SC_PHYS_PAGES); memsize *= sysconf(_SC_PAGESIZE); #endif @@ -712,7 +712,7 @@ typedef enum { static bool also_do_stderr(const _cf_logging_style style) { bool result = false; -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX // just log to stderr, other logging facilities are out result = true; #elif TARGET_OS_OSX || TARGET_OS_IPHONE @@ -1232,7 +1232,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (0LL == statBuf.st_size) { bytes = malloc(8); // don't return constant string -- it's freed! length = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD } else if (map) { if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) { int32_t savederrno = errno; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index e5b362e8d1..18c785c960 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -143,7 +143,7 @@ typedef int boolean_t; #include // mode_t #endif -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #define CF_PRIVATE extern __attribute__((visibility("hidden"))) #define __weak @@ -260,10 +260,10 @@ void OSMemoryBarrier(); #endif -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #include #endif -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #if !defined(ABS) #define ABS(A) ((A) < 0 ? (-(A)) : (A)) #endif @@ -454,7 +454,7 @@ CF_EXPORT int64_t OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *_ #define CF_TEST_PRIVATE CF_PRIVATE #endif -#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS #include diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index 5998001d3d..b9174de20f 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -46,7 +46,7 @@ CF_IMPLICIT_BRIDGING_DISABLED // ---- CFRuntime material ---------------------------------------- -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #include #elif TARGET_OS_BSD #include // malloc() diff --git a/CoreFoundation/CMakeLists.txt b/CoreFoundation/CMakeLists.txt index c60aea03c8..97586bdf23 100644 --- a/CoreFoundation/CMakeLists.txt +++ b/CoreFoundation/CMakeLists.txt @@ -336,7 +336,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android) target_compile_definitions(CoreFoundation PRIVATE - -DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE) if(HAVE_SCHED_GETAFFINITY) target_compile_definitions(CoreFoundation diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index edd40e6019..0a52f45da3 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -43,7 +43,7 @@ CF_INLINE unsigned long __CFPageSize() { GetSystemInfo(&sysInfo); return sysInfo.dwPageSize; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #include CF_INLINE unsigned long __CFPageSize() { return (unsigned long)getpagesize(); diff --git a/CoreFoundation/Locale.subproj/CFDateFormatter.c b/CoreFoundation/Locale.subproj/CFDateFormatter.c index 7627896c83..3d023733fa 100644 --- a/CoreFoundation/Locale.subproj/CFDateFormatter.c +++ b/CoreFoundation/Locale.subproj/CFDateFormatter.c @@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) { int32_t years = 0; __cficu_ucal_clear(calendar); @@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter } } } else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX __cficu_ucal_clear(cal); __cficu_ucal_set(cal, UCAL_ERA, 1); __cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status); diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index 675372d3cd..342deecc97 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include @@ -585,7 +585,7 @@ static CFLocaleRef _CFLocaleCopyCurrentGuts(CFStringRef name, Boolean useCache, // things which call this function thousands or millions of times in // a short period. if (!name) { -#if 0 // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if 0 // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX name = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication); #endif } else { @@ -891,7 +891,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C langPref = (CFArrayRef)CFDictionaryGetValue(displayLocale->_prefs, CFSTR("AppleLanguages")); if (langPref) CFRetain(langPref); } else { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX langPref = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); #endif } @@ -916,7 +916,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C } CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX int32_t locale, localeCount = uloc_countAvailable(); CFMutableSetRef working = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeSetCallBacks); for (locale = 0; locale < localeCount; ++locale) { @@ -937,7 +937,7 @@ CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static CFArrayRef __CFLocaleCopyCStringsAsArray(const char* const* p) { CFMutableArrayRef working = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); for (; *p; ++p) { @@ -977,7 +977,7 @@ static CFArrayRef __CFLocaleCopyUEnumerationAsArray(UEnumeration *enumer, UError #endif CFArrayRef CFLocaleCopyISOLanguageCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX const char* const* p = uloc_getISOLanguages(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -986,7 +986,7 @@ CFArrayRef CFLocaleCopyISOLanguageCodes(void) { } CFArrayRef CFLocaleCopyISOCountryCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX const char* const* p = uloc_getISOCountries(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -995,7 +995,7 @@ CFArrayRef CFLocaleCopyISOCountryCodes(void) { } CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_ALL, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1007,7 +1007,7 @@ CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { } CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_COMMON|UCURR_NON_DEPRECATED, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1019,7 +1019,7 @@ CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { } CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef allocator, uint32_t lcid) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char buffer[kMaxICUNameSize]; UErrorCode status = U_ZERO_ERROR; int32_t ret = uloc_getLocaleForLCID(lcid, buffer, kMaxICUNameSize, &status); @@ -1034,7 +1034,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef a } uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIdentifier) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringRef ident = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorSystemDefault, localeIdentifier); char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = ident ? CFStringGetCString(ident, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; @@ -1046,7 +1046,7 @@ uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIden } CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoLangCode) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1066,7 +1066,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoL } CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCode) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1180,7 +1180,7 @@ static bool __CFLocaleCopyCodes(CFLocaleRef locale, bool user, CFTypeRef *cf, CF return false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { UErrorCode icuErr = U_ZERO_ERROR; CFMutableCharacterSetRef working = CFCharacterSetCreateMutable(NULL); @@ -1236,7 +1236,7 @@ CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { #endif static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1257,7 +1257,7 @@ static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1275,7 +1275,7 @@ static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyICUCalendarID(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1360,7 +1360,7 @@ static bool __CFLocaleCopyCalendarID(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (__CFLocaleCopyCalendarID(locale, user, cf, context)) { CFCalendarRef calendar = _CFCalendarCreateCoWWithIdentifier((CFStringRef)*cf); CFCalendarSetLocale(calendar, locale); @@ -1394,7 +1394,7 @@ static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, } static bool __CFLocaleCopyDelimiter(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX ULocaleDataDelimiterType type = (ULocaleDataDelimiterType)0; if (context == kCFLocaleQuotationBeginDelimiterKey) { type = ULOCDATA_QUOTATION_START; @@ -1517,7 +1517,7 @@ static CFStringRef _CFLocaleGetTemperatureUnitName(bool celsius) { } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" @@ -1560,7 +1560,7 @@ static bool __CFLocaleGetMeasurementSystemForName(CFStringRef name, UMeasuremen #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UMeasurementSystem *outMeasurementSystem) { UMeasurementSystem output = UMS_SI; // Default is Metric bool done = false; @@ -1590,7 +1590,7 @@ static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UM static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = system != UMS_US ? kCFBooleanTrue : kCFBooleanFalse; @@ -1602,7 +1602,7 @@ static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyMeasurementSystem(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = CFRetain(__CFLocaleGetMeasurementSystemName(system)); @@ -1625,7 +1625,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR done = _CFLocaleGetTemperatureUnitForPreferences(temperatureUnitPref, &celsius); } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (!done) { char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1663,7 +1663,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterDecimalStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1679,7 +1679,7 @@ static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef // so we have to have another routine here which creates a Currency number formatter. static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterCurrencyStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1691,7 +1691,7 @@ static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef return false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX typedef int32_t (*__CFICUFunction)(const char *, const char *, UChar *, int32_t, UErrorCode *); static bool __CFLocaleICUName(const char *locale, const char *valLocale, CFStringRef *out, __CFICUFunction icu) { @@ -1763,7 +1763,7 @@ static bool __CFLocaleICUCurrencyName(const char *locale, const char *value, UCu #endif static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; int32_t size; UChar name[kMaxICUNameSize]; @@ -1796,7 +1796,7 @@ static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRe } static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUName(locale, value, out, uloc_getDisplayLanguage); #else *out = CFRetain(CFSTR("(none)")); @@ -1805,7 +1805,7 @@ static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStri } static bool __CFLocaleCountryName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) < sizeof(lid) - 3) { @@ -1821,7 +1821,7 @@ static bool __CFLocaleCountryName(const char *locale, const char *value, CFStrin } static bool __CFLocaleScriptName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) == 4) { @@ -1838,7 +1838,7 @@ static bool __CFLocaleScriptName(const char *locale, const char *value, CFString } static bool __CFLocaleVariantName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (strlen(value) < sizeof(lid) - 6) { @@ -1854,7 +1854,7 @@ static bool __CFLocaleVariantName(const char *locale, const char *value, CFStrin } static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCalendarKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1863,7 +1863,7 @@ static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStri } static bool __CFLocaleCollationName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCollationKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1872,7 +1872,7 @@ static bool __CFLocaleCollationName(const char *locale, const char *value, CFStr } static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_SYMBOL_NAME, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1881,7 +1881,7 @@ static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, C } static bool __CFLocaleCurrencyFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_LONG_NAME, out); #else *out = CFRetain(CFSTR("(none)")); diff --git a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c index fbd222b973..c47cd16f59 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c +++ b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c @@ -58,7 +58,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include #else #define ULOC_KEYWORD_SEPARATOR '@' @@ -1155,7 +1155,7 @@ enum { }; */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX struct LocaleToLegacyCodes { const char * locale; // reduced to language plus one other component (script, region, variant), separators normalized to'_' @@ -1593,7 +1593,7 @@ static void _UpdateFullLocaleString(char inLocaleString[], int locStringMaxLen, // If so, copy the keywords to varKeyValueString and delete the variant tag // from the original string (but don't otherwise use the ICU canonicalization). varKeyValueString[0] = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (variantTag) { UErrorCode icuStatus; int icuCanonStringLen; @@ -1720,7 +1720,7 @@ static void _GetKeyValueString(char inLocaleString[], char keyValueString[]) { } static void _AppendKeyValueString(char inLocaleString[], int locStringMaxLen, char keyValueString[]) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (keyValueString[0] != 0) { UErrorCode uerr = U_ZERO_ERROR; UEnumeration * uenum = uloc_openKeywords(keyValueString, &uerr); @@ -1952,12 +1952,12 @@ SPI: CFLocaleGetLanguageRegionEncodingForLocaleIdentifier gets the appropriate preferred localization in the current context (this function returns NO for a NULL localeIdentifier); and in this function langCode, regCode, and scriptCode are all SInt16* (not SInt32* like the equivalent parameters in CFBundleGetLocalizationInfoForLocalization). */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ); #endif Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeIdentifier, LangCode *langCode, RegionCode *regCode, ScriptCode *scriptCode, CFStringEncoding *stringEncoding) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX Boolean returnValue = false; CFStringRef canonicalIdentifier = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, localeIdentifier); if (canonicalIdentifier) { @@ -2035,7 +2035,7 @@ Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeI #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ) { const char * localeString1 = ((const LocaleToLegacyCodes *)entry1)->locale; const char * localeString2 = ((const LocaleToLegacyCodes *)entry2)->locale; @@ -2045,7 +2045,7 @@ static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *en CFDictionaryRef CFLocaleCreateComponentsFromLocaleIdentifier(CFAllocatorRef allocator, CFStringRef localeID) { CFMutableDictionaryRef working = CFDictionaryCreateMutable(allocator, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char cLocaleID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; char buffer[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -2175,7 +2175,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato free(variant); free(buf1); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX for (CFIndex idx = 0; idx < cnt; idx++) { if (keys[idx]) { char *key = __CStringFromString(keys[idx]); diff --git a/CoreFoundation/Locale.subproj/CFLocaleKeys.c b/CoreFoundation/Locale.subproj/CFLocaleKeys.c index 0ec9c118e0..3cbc2f2fc8 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleKeys.c +++ b/CoreFoundation/Locale.subproj/CFLocaleKeys.c @@ -133,7 +133,7 @@ CONST_STRING_DECL(kCFCalendarIdentifierEthiopicAmeteMihret, "ethiopic"); CONST_STRING_DECL(kCFCalendarIdentifierEthiopicAmeteAlem, "ethiopic-amete-alem"); // Aliases for Linux -#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS CF_EXPORT CFStringRef const kCFBuddhistCalendar __attribute__((alias ("kCFCalendarIdentifierBuddhist"))); CF_EXPORT CFStringRef const kCFChineseCalendar __attribute__((alias ("kCFCalendarIdentifierChinese"))); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index ef21e1b1af..744012da31 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -26,7 +26,7 @@ #endif #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #include #endif @@ -114,7 +114,7 @@ CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { #if TARGET_OS_OSX || TARGET_OS_IPHONE uint64_t tsr = mach_absolute_time(); return (CFTimeInterval)((double)tsr * __CF1_TSRRate); -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD struct timespec res; if (clock_gettime(CLOCK_MONOTONIC, &res) != 0) { HALT; @@ -176,7 +176,7 @@ CF_PRIVATE void __CFDateInitialize(void) { } __CFTSRRate = (double)freq.QuadPart; __CF1_TSRRate = 1.0 / __CFTSRRate; -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD struct timespec res; if (clock_getres(CLOCK_MONOTONIC, &res) != 0) { HALT; @@ -360,7 +360,7 @@ CFAbsoluteTime CFGregorianDateGetAbsoluteTime(CFGregorianDate gdate, CFTimeZoneR CFAbsoluteTime at; at = 86400.0 * __CFAbsoluteFromYMD(gdate.year - 2001, gdate.month, gdate.day); at += 3600.0 * gdate.hour + 60.0 * gdate.minute + gdate.second; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -379,7 +379,7 @@ CFGregorianDate CFAbsoluteTimeGetGregorianDate(CFAbsoluteTime at, CFTimeZoneRef int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -407,7 +407,7 @@ CFAbsoluteTime CFAbsoluteTimeAddGregorianUnits(CFAbsoluteTime at, CFTimeZoneRef CFAbsoluteTime candidate_at0, candidate_at1; uint8_t monthdays; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -526,7 +526,7 @@ CFGregorianUnits CFAbsoluteTimeGetDifferenceAsGregorianUnits(CFAbsoluteTime at1, SInt32 CFAbsoluteTimeGetDayOfWeek(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -542,7 +542,7 @@ SInt32 CFAbsoluteTimeGetDayOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { CFAbsoluteTime fixedat; int64_t absolute, year; int8_t month, day; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -561,7 +561,7 @@ SInt32 CFAbsoluteTimeGetWeekOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index 435c37ec52..d3c2a61bcb 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -180,7 +180,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define BITSFORDOUBLEZERO doubleZeroBits.bits #define BITSFORDOUBLEONE doubleOneBits.bits -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L diff --git a/CoreFoundation/Parsing.subproj/CFPropertyList.c b/CoreFoundation/Parsing.subproj/CFPropertyList.c index 3362b3d10a..76f0eb38a4 100644 --- a/CoreFoundation/Parsing.subproj/CFPropertyList.c +++ b/CoreFoundation/Parsing.subproj/CFPropertyList.c @@ -2320,7 +2320,7 @@ static CFStringEncoding encodingForXMLData(CFDataRef data, CFErrorRef *error, CF if (len == 5 && (*base == 'u' || *base == 'U') && (base[1] == 't' || base[1] == 'T') && (base[2] == 'f' || base[2] == 'F') && (base[3] == '-') && (base[4] == '8')) return kCFStringEncodingUTF8; encodingName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, base, len, kCFStringEncodingISOLatin1, false); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringEncoding enc = CFStringConvertIANACharSetNameToEncoding(encodingName); if (enc != kCFStringEncodingInvalidId) { CFRelease(encodingName); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h index c6d81d4a6b..27edea4e7b 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h +++ b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h @@ -26,7 +26,7 @@ CF_EXTERN_C_BEGIN #define USE_DYLD_PRIV 1 #elif DEPLOYMENT_TARGET_WINDOWS #define BINARY_SUPPORT_DLL 1 -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD #define BINARY_SUPPORT_DLFCN 1 #else #error Unknown or unspecified DEPLOYMENT_TARGET diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index f0979eefe1..f1e52119c7 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -18,25 +18,25 @@ #if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID - #if DEPLOYMENT_TARGET_LINUX + #if TARGET_OS_LINUX #if TARGET_RT_64_BIT #define _CFBundleFHSArchDirectorySuffix "64" #else // !TARGET_RT_64_BIT #define _CFBundleFHSArchDirectorySuffix "32" #endif // TARGET_RT_64_BIT - #endif // DEPLOYMENT_TARGET_LINUX + #endif // TARGET_OS_LINUX CONST_STRING_DECL(_kCFBundleFHSDirectory_bin, "bin"); CONST_STRING_DECL(_kCFBundleFHSDirectory_sbin, "sbin"); CONST_STRING_DECL(_kCFBundleFHSDirectory_lib, "lib"); - #if DEPLOYMENT_TARGET_LINUX + #if TARGET_OS_LINUX CONST_STRING_DECL(_kCFBundleFHSDirectory_libWithArchSuffix, "lib" _CFBundleFHSArchDirectorySuffix); #endif #define _CFBundleFHSExecutablesDirectorySuffix CFSTR(".executables") #define _CFBundleFHSDirectoryCLiteral_libexec "libexec" -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX #define _CFBundleFHSDirectoriesInExecutableSearchOrder \ _kCFBundleFHSDirectory_bin, \ _kCFBundleFHSDirectory_sbin, \ @@ -47,7 +47,7 @@ _kCFBundleFHSDirectory_bin, \ _kCFBundleFHSDirectory_sbin, \ _kCFBundleFHSDirectory_lib -#endif // DEPLOYMENT_TARGET_LINUX +#endif // TARGET_OS_LINUX #endif // !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index 3287c2f77b..e774121d7c 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -25,7 +25,7 @@ #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX #include #if !TARGET_OS_ANDROID #include @@ -296,7 +296,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { return CFSTR("Solaris"); #elif DEPLOYMENT_TARGET_HPUX return CFSTR("HPUX"); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #if TARGET_OS_CYGWIN return CFSTR("Cygwin"); #else @@ -318,7 +318,7 @@ CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { return CFSTR("Solaris"); #elif DEPLOYMENT_TARGET_HPUX return CFSTR("HPUX"); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #if TARGET_OS_CYGWIN return CFSTR("Cygwin"); #else diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index 58d00be062..4216c679b4 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -109,7 +109,7 @@ DISPATCH_EXPORT void _dispatch_main_queue_callback_4CF(void * _Null_unspecified) #define mach_port_name_t HANDLE #define mach_port_t HANDLE -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #include #include @@ -122,7 +122,7 @@ extern void _dispatch_main_queue_callback_4CF(void *_Null_unspecified msg); #endif -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CF_EXPORT _CFThreadRef _CF_pthread_main_thread_np(void); #define pthread_main_thread_np() _CF_pthread_main_thread_np() #endif @@ -157,7 +157,7 @@ static _CFThreadRef const kNilPthreadT = INVALID_HANDLE_VALUE; typedef int kern_return_t; #define KERN_SUCCESS 0 -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; #define pthreadPointer(a) ((void*)a) @@ -213,7 +213,7 @@ static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; // NOTE: this is locally defined rather than in CFInternal.h as on Linux, // `linux/sysctl.h` defines `struct __sysctl_args` with an `__unused` member // which breaks the build. -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN || TARGET_OS_LINUX #ifndef __unused #if __has_attribute(unused) #define __unused __attribute__((unused)) @@ -491,7 +491,7 @@ static kern_return_t __CFPortSetRemove(__CFPort port, __CFPortSet portSet) { return KERN_SUCCESS; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX // eventfd/timerfd descriptor typedef int __CFPort; #define CFPORT_NULL -1 @@ -574,7 +574,7 @@ static uint32_t __CFSendTrivialMachMessage(mach_port_t port, uint32_t msg_id, CF __CFMachMessageCheckForAndDestroyUnsentMessage(result, &header); return result; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX static int mk_timer_create(void) { return timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC); @@ -2509,7 +2509,7 @@ static Boolean __CFRunLoopServiceMachPort(mach_port_name_t port, mach_msg_header return false; } -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #define TIMEOUT_INFINITY UINT64_MAX @@ -2753,7 +2753,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN HANDLE livePort = NULL; Boolean windowsMessageReceived = false; -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX int livePort = -1; #endif __CFPortSet waitSet = rlm->_portSet; @@ -2784,7 +2784,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter if (__CFRunLoopServiceMachPort(dispatchPort, &msg, sizeof(msg_buffer), &livePort, 0, &voucherState, NULL, rl, rlm)) { goto handle_msg; } -#elif DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN +#elif TARGET_OS_LINUX && !TARGET_OS_CYGWIN if (__CFRunLoopServiceFileDescriptors(CFPORTSET_NULL, dispatchPort, 0, &livePort)) { goto handle_msg; } @@ -2845,7 +2845,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #elif DEPLOYMENT_TARGET_WINDOWS // Here, use the app-supplied message queue mask. They will set this if they are interested in having this run loop receive windows messages. __CFRunLoopWaitForMultipleObjects(waitSet, NULL, poll ? 0 : TIMEOUT_INFINITY, rlm->_msgQMask, &livePort, &windowsMessageReceived); -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX __CFRunLoopServiceFileDescriptors(waitSet, CFPORT_NULL, TIMEOUT_INFINITY, &livePort); #endif @@ -2952,7 +2952,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter __CFRunLoopModeUnlock(rlm); __CFRunLoopUnlock(rl); _CFSetTSD(__CFTSDKeyIsInGCDMainQ, (void *)6, NULL); -#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX void *msg = 0; #endif cf_trace(KDEBUG_EVENT_CFRL_IS_CALLING_DISPATCH | DBG_FUNC_START, rl, rlm, msg, livePort); @@ -2981,7 +2981,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter (void)mach_msg(reply, MACH_SEND_MSG, reply->msgh_size, 0, MACH_PORT_NULL, 0, MACH_PORT_NULL); CFAllocatorDeallocate(kCFAllocatorSystemDefault, reply); } -#elif DEPLOYMENT_TARGET_WINDOWS || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif DEPLOYMENT_TARGET_WINDOWS || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) sourceHandledThisLoop = __CFRunLoopDoSource1(rl, rlm, rls) || sourceHandledThisLoop; #endif } else { @@ -3121,7 +3121,7 @@ void CFRunLoopWakeUp(CFRunLoopRef rl) { * wakeup pending, since the queue length is 1. */ ret = __CFSendTrivialMachMessage(rl->_wakeUpPort, 0, MACH_SEND_TIMEOUT, 0); if (ret != MACH_MSG_SUCCESS && ret != MACH_SEND_TIMED_OUT) CRASH("*** Unable to send message to wake up port. (%x) ***", ret); -#elif DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN +#elif TARGET_OS_LINUX && !TARGET_OS_CYGWIN int ret; do { ret = eventfd_write(rl->_wakeUpPort, 1); @@ -3717,7 +3717,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL void *addr = rls->_context.version0.version == 0 ? (void *)rls->_context.version0.perform : (rls->_context.version0.version == 1 ? (void *)rls->_context.version1.perform : NULL); #if DEPLOYMENT_TARGET_WINDOWS contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %p}"), rls->_context.version0.version, rls->_context.version0.info, addr); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %s (%p)}"), rls->_context.version0.version, rls->_context.version0.info, name, addr); @@ -3916,7 +3916,7 @@ static CFStringRef __CFRunLoopObserverCopyDescription(CFTypeRef cf) { /* DOES CA } #if DEPLOYMENT_TARGET_WINDOWS result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{valid = %s, activities = 0x%x, repeats = %s, order = %d, callout = %p, context = %@}"), cf, CFGetAllocator(rlo), __CFIsValid(rlo) ? "Yes" : "No", rlo->_activities, __CFRunLoopObserverRepeats(rlo) ? "Yes" : "No", rlo->_order, rlo->_callout, contextDesc); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (DEPLOYMENT_TARGET_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) void *addr = rlo->_callout; Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 9e4897713b..9ccc078171 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -1117,7 +1117,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_UNIX #define INVALID_SOCKET (CFSocketNativeHandle)(-1) #define closesocket(a) close((a)) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) @@ -2615,7 +2615,7 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN if (INVALID_SOCKET != sock) CFDictionaryAddValue(__CFAllSockets, (void *)(uintptr_t)sock, memory); if (NULL == __CFSocketManagerThread) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD _CFThreadRef tid = 0; pthread_attr_t attr; pthread_attr_init(&attr); diff --git a/CoreFoundation/Stream.subproj/CFConcreteStreams.c b/CoreFoundation/Stream.subproj/CFConcreteStreams.c index 0a665a50b1..e9fe287848 100644 --- a/CoreFoundation/Stream.subproj/CFConcreteStreams.c +++ b/CoreFoundation/Stream.subproj/CFConcreteStreams.c @@ -18,7 +18,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX #include #include #endif diff --git a/CoreFoundation/Stream.subproj/CFStream.c b/CoreFoundation/Stream.subproj/CFStream.c index 305de44c37..383e3f343e 100644 --- a/CoreFoundation/Stream.subproj/CFStream.c +++ b/CoreFoundation/Stream.subproj/CFStream.c @@ -1663,7 +1663,7 @@ static void _perform(void* info) static void* _legacyStreamRunLoop_workThread(void* arg) { -#if DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_LINUX pthread_setname_np(pthread_self(), "com.apple.CFStream.LegacyThread"); #else pthread_setname_np("com.apple.CFStream.LegacyThread"); diff --git a/CoreFoundation/String.subproj/CFBurstTrie.c b/CoreFoundation/String.subproj/CFBurstTrie.c index 0d5f4103a9..9ccc540dc0 100644 --- a/CoreFoundation/String.subproj/CFBurstTrie.c +++ b/CoreFoundation/String.subproj/CFBurstTrie.c @@ -18,7 +18,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX #include #include #include diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index c00f8294e3..8ee029145e 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -27,14 +27,14 @@ #include "CFString_Internal.h" #include "CFRuntime_Internal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include "CFLocaleInternal.h" #include "CFStringLocalizedFormattingInternal.h" #endif #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #include #endif @@ -416,7 +416,7 @@ CFStringEncoding __CFDefaultEightBitStringEncoding = kCFStringEncodingInvalidId; #if TARGET_OS_OSX || TARGET_OS_IPHONE #define __defaultEncoding kCFStringEncodingMacRoman -#elif DEPLOYMENT_TARGET_LINUX +#elif TARGET_OS_LINUX #define __defaultEncoding kCFStringEncodingUTF8 #elif DEPLOYMENT_TARGET_WINDOWS #define __defaultEncoding kCFStringEncodingWindowsLatin1 @@ -4657,7 +4657,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (((encoding & 0x0FFF) == kCFStringEncodingUnicode) && ((encoding == kCFStringEncodingUnicode) || ((encoding > kCFStringEncodingUTF8) && (encoding <= kCFStringEncodingUTF32LE)))) { guessedByteLength = (length + 1) * ((((encoding >> 26) & 2) == 0) ? sizeof(UTF16Char) : sizeof(UTF32Char)); // UTF32 format has the bit set } else if (((guessedByteLength = CFStringGetMaximumSizeForEncoding(length, encoding)) > length) && !CF_IS_OBJC(_kCFRuntimeIDCFString, string) && !CF_IS_SWIFT(_kCFRuntimeIDCFString, string)) { // Multi byte encoding -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD if (__CFStrIsUnicode(string)) { CFIndex aLength = CFStringEncodingByteLengthForCharacters(encoding, kCFStringEncodingPrependBOM, __CFStrContents(string), __CFStrLength(string)); if (aLength > 0) guessedByteLength = aLength; @@ -4671,7 +4671,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (guessedByteLength == length && __CFStrIsEightBit(string) && __CFStringEncodingIsSupersetOfASCII(encoding)) { // It's all ASCII !! return CFDataCreate(alloc, ((uint8_t *)__CFStrContents(string) + __CFStrSkipAnyLengthByte(string)), __CFStrLength(string)); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD } #endif } @@ -7186,7 +7186,7 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr } // See if we need to localize the decimal point if (formatOptions) { // We have localization info -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringRef decimalSeparator = (CFGetTypeID(formatOptions) == CFLocaleGetTypeID()) ? (CFStringRef)CFLocaleGetValue((CFLocaleRef)formatOptions, kCFLocaleDecimalSeparatorKey) : (CFStringRef)CFDictionaryGetValue(formatOptions, CFSTR("NSDecimalSeparator")); #else CFStringRef decimalSeparator = CFSTR("."); diff --git a/CoreFoundation/String.subproj/CFStringUtilities.c b/CoreFoundation/String.subproj/CFStringUtilities.c index 3e519d6ffa..172cf79e2f 100644 --- a/CoreFoundation/String.subproj/CFStringUtilities.c +++ b/CoreFoundation/String.subproj/CFStringUtilities.c @@ -17,7 +17,7 @@ #include "CFICUConverters.h" #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include #include #endif @@ -110,7 +110,7 @@ CFStringEncoding CFStringConvertIANACharSetNameToEncoding(CFStringRef charsetNam encoding = __CFStringEncodingGetFromCanonicalName(name); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingInvalidId == encoding) encoding = __CFStringEncodingGetFromICUName(name); #endif @@ -258,7 +258,7 @@ CFStringEncoding CFStringGetMostCompatibleMacStringEncoding(CFStringEncoding enc #define kCFStringCompareAllocationIncrement (128) -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // ------------------------------------------------------------------------------------------------- // CompareSpecials - ignore case & diacritic differences @@ -526,7 +526,7 @@ static OSStatus __CompareTextDefault(UCollator *collator, CFOptionFlags options, return 0; // noErr } -#endif // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#endif // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static inline CFIndex __extendLocationBackward(CFIndex location, CFStringInlineBuffer *str, const uint8_t *nonBaseBMP, const uint8_t *punctBMP) { while (location > 0) { @@ -570,7 +570,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * CFRange range1 = str1Range; CFRange range2 = str2Range; SInt32 order; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX Boolean isEqual; bool forcedOrdering = ((options & kCFCompareForcedOrdering) ? true : false); @@ -604,7 +604,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range2.location = __extendLocationBackward(range2.location - 1, str2, nonBaseBMP, punctBMP); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #if TARGET_OS_OSX || TARGET_OS_IPHONE // First we try to use the last one used on this thread, if the locale is the same, // otherwise we try to check out a default one, or then we create one. @@ -632,7 +632,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range1.length = (str1Range.location + str1Range.length) - range1.location; range2.length = (str2Range.location + str2Range.length) - range2.location; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { compResult = ((isEqual && !forcedOrdering) ? kCFCompareEqualTo : ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan)); } else @@ -702,7 +702,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { if (isEqual) { if (forcedOrdering && (kCFCompareEqualTo == compResult) && (0 != order)) compResult = ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan); diff --git a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c index 81190cea35..a5ccf44a62 100644 --- a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c @@ -27,7 +27,7 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static const CFStringEncodingConverter __CFICUBootstrap = { .toBytes.standard = NULL, @@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert if (__CFIsPlatformConverterAvailable(encoding)) { return &__CFPlatformBootstrap; } else { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (__CFStringEncodingGetICUName(encoding)) { return &__CFICUBootstrap; } diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index 037662c41e..c212303d95 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper; break; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX case kCFStringEncodingConverterICU: converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding); break; @@ -599,7 +599,7 @@ static const _CFEncodingConverter *__CFGetConverter(uint32_t encoding) { case kCFStringEncodingUTF8: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[0]); break; /* the swith here should avoid possible bootstrap issues in the default: case below when invoked from CFStringGetSystemEncoding() */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX case kCFStringEncodingMacRoman: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[1]); break; #elif DEPLOYMENT_TARGET_WINDOWS case kCFStringEncodingWindowsLatin1: commonConverterSlot = (const _CFEncodingConverter **)(&(commonConverters[1])); break; @@ -696,7 +696,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen); #endif @@ -825,7 +825,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const if (!converter) return kCFStringEncodingConverterUnavailable; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen); #endif @@ -869,7 +869,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_ const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes); #endif @@ -913,7 +913,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars); #endif @@ -998,7 +998,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void if (NULL == encodings) { CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings; CFIndex numICUConverters = 0, numPlatformConverters = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters); #else CFStringEncoding *icuConverters = NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c index a09da654fb..8470df1423 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingDatabase.c @@ -568,7 +568,7 @@ CF_PRIVATE CFStringEncoding __CFStringEncodingGetFromCanonicalName(const char *c } #undef LENGTH_LIMIT -#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_LINUX // This list indexes from DOS range static uint16_t const __CFISO8859SimilarScriptList[] = { kCFStringEncodingMacRoman, @@ -780,7 +780,7 @@ static const char * const __CFOtherNameList[] = { #endif /* TARGET_OS_OSX */ CF_PRIVATE CFStringEncoding __CFStringEncodingGetMostCompatibleMacScript(CFStringEncoding encoding) { -#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_LINUX switch (encoding & 0x0F00) { case 0: return encoding & 0xFF; break; // Mac scripts @@ -817,7 +817,7 @@ CF_PRIVATE const char *__CFStringEncodingGetName(CFStringEncoding encoding) { case kCFStringEncodingUTF7: return "Unicode (UTF-7)"; break; } -#if TARGET_OS_OSX || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_LINUX if (0x0200 == (encoding & 0x0F00)) { encoding &= 0x00FF; diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index 9a15aa3bda..909e8c80e5 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -15,7 +15,7 @@ #include "CFStringEncodingConverterExt.h" #include "CFUnicodeDecomposition.h" #include "CFUniCharPriv.h" -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #include #include #include @@ -34,7 +34,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #if TARGET_OS_OSX || TARGET_OS_IPHONE #define __kCFCharacterSetDir "/System/Library/CoreServices" -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" #elif DEPLOYMENT_TARGET_WINDOWS #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" @@ -42,7 +42,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #if TARGET_OS_OSX || TARGET_OS_IPHONE #define USE_MACHO_SEGMENT 1 -#elif DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) +#elif DEPLOYMENT_RUNTIME_SWIFT && (TARGET_OS_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) #define USE_RAW_SYMBOL 1 #endif @@ -107,7 +107,7 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, // Memory map the file -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { @@ -116,7 +116,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #endif #if TARGET_OS_OSX || TARGET_OS_IPHONE strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); -#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#elif TARGET_OS_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif DEPLOYMENT_TARGET_WINDOWS wchar_t frameworkPath[MAXPATHLEN]; @@ -171,7 +171,7 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { #elif DEPLOYMENT_TARGET_WINDOWS static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { @@ -238,7 +238,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #endif // USE_MACHO_SEGMENT -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #if !defined(CF_UNICHAR_BITMAP_FILE) #if USE_MACHO_SEGMENT #define CF_UNICHAR_BITMAP_FILE "__csbitmaps" @@ -254,7 +254,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -286,7 +286,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -308,7 +308,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICODE_DATA_SYM __CFUnicodeDataL #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_MACHO_SEGMENT *bytes = __CFGetSectDataPtr("__UNICODE", bitmapName, NULL); diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index f30e3510b5..70786f2963 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -20,7 +20,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX #if TARGET_OS_OSX #include #endif @@ -2262,7 +2262,7 @@ static CFURLRef _CFURLCreateWithFileSystemRepresentation(CFAllocatorRef allocato #endif struct __CFURL *result = NULL; if (bufLen > 0) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX Boolean isAbsolute = bufLen && (*buffer == '/'); Boolean addedPercentEncoding; Boolean releaseBaseURL = false; @@ -4045,7 +4045,7 @@ static CFStringRef URLPathToPOSIXPath(CFStringRef path, CFAllocatorRef allocator return result; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str, UInt8 *inBuffer, CFIndex inBufferLen) { size_t fileURLPrefixLength; @@ -4371,7 +4371,7 @@ CF_EXPORT CFStringRef CFURLCopyFileSystemPath(CFURLRef anURL, CFURLPathStyle pat CFStringRef result = NULL; CFAllocatorRef alloc = CFGetAllocator(anURL); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX Boolean isCanonicalFileURL = false; if ( (pathStyle == kCFURLPOSIXPathStyle) && (CFURLGetBaseURL(anURL) == NULL) ) { @@ -4515,13 +4515,13 @@ CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLR } Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, uint8_t *buffer, CFIndex bufLen) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS CFAllocatorRef alloc = CFGetAllocator(url); CFStringRef path; if (!url) return false; #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX +#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX if ( !resolveAgainstBase || (CFURLGetBaseURL(url) == NULL) ) { if (!CF_IS_OBJC(CFURLGetTypeID(), url)) { // We can access the ivars diff --git a/CoreFoundation/URL.subproj/CFURL.inc.h b/CoreFoundation/URL.subproj/CFURL.inc.h index a3d3db90d8..af8eef4785 100644 --- a/CoreFoundation/URL.subproj/CFURL.inc.h +++ b/CoreFoundation/URL.subproj/CFURL.inc.h @@ -250,7 +250,7 @@ } else if (!sawPercent) { flags |= POSIX_AND_URL_PATHS_MATCH; } -#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS if (!sawPercent) { flags |= POSIX_AND_URL_PATHS_MATCH; } diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index a7b73e42d1..49ff8f4c91 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -24,7 +24,7 @@ CFData read/write routines #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IOS || TARGET_OS_LINUX || TARGET_OS_BSD #include #include #include @@ -233,7 +233,7 @@ static Boolean _CFFileURLWritePropertiesToResource(CFURLRef url, CFDictionaryRef CFNumberRef modeNum = (CFNumberRef)value; CFNumberGetValue(modeNum, kCFNumberSInt32Type, &mode); } else { -#if TARGET_OS_OSX || TARGET_OS_IOS || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD +#if TARGET_OS_OSX || TARGET_OS_IOS || TARGET_OS_LINUX || TARGET_OS_BSD #define MODE_TYPE mode_t #elif DEPLOYMENT_TARGET_WINDOWS #define MODE_TYPE uint16_t diff --git a/CoreFoundation/build.py b/CoreFoundation/build.py index 05315e17ef..804a1ececd 100755 --- a/CoreFoundation/build.py +++ b/CoreFoundation/build.py @@ -14,7 +14,7 @@ cf.GCC_PREFIX_HEADER = 'Base.subproj/CoreFoundation_Prefix.h' if Configuration.current.target.sdk == OSType.Linux: - cf.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -DCF_CHARACTERSET_DATA_DIR="CharacterSets" ' + cf.CFLAGS = '-D_GNU_SOURCE -DCF_CHARACTERSET_DATA_DIR="CharacterSets" ' cf.LDFLAGS = '-Wl,-Bsymbolic ' Configuration.current.requires_pkg_config = True elif Configuration.current.target.sdk == OSType.FreeBSD: @@ -23,7 +23,7 @@ elif Configuration.current.target.sdk == OSType.MacOSX: cf.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r ' elif Configuration.current.target.sdk == OSType.Win32 and Configuration.current.target.environ == EnvironmentType.Cygnus: - cf.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -mcmodel=large ' + cf.CFLAGS = '-D_GNU_SOURCE -mcmodel=large ' cf.LDFLAGS = '${SWIFT_USE_LINKER} -lswiftGlibc `icu-config --ldflags` -Wl,--allow-multiple-definition ' cf.ASFLAGS = " ".join([ diff --git a/Docs/Design.md b/Docs/Design.md index 93e2bd6a22..b056dafe21 100644 --- a/Docs/Design.md +++ b/Docs/Design.md @@ -124,5 +124,5 @@ Parts of the CoreFoundation and Foundation libraries are as old as macOS (or old There are some additional considerations when working on the CoreFoundation part of our code, both because it is written in C and also because it is shared amongst platforms. * Surround Swift-runtime-specific code with the standard macro `#if DEPLOYMENT_RUNTIME_SWIFT`. -* Surround platform-specific code with our standard macros `TARGET_OS_OSX`, `TARGET_OS_IPHONE` (all iOS platforms and derivatives), `DEPLOYMENT_TARGET_LINUX`. +* Surround platform-specific code with our standard macros `TARGET_OS_OSX`, `TARGET_OS_IPHONE` (all iOS platforms and derivatives), `TARGET_OS_LINUX`. * Follow the coding style of the .c file that you are working in. diff --git a/build.py b/build.py index 710abc9b4b..1eef0ca327 100755 --- a/build.py +++ b/build.py @@ -15,7 +15,7 @@ swift_cflags = ['-DDEPLOYMENT_RUNTIME_SWIFT'] if Configuration.current.target.sdk == OSType.Linux: - foundation.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -DCF_CHARACTERSET_DATA_DIR="CoreFoundation/CharacterSets"' + foundation.CFLAGS = '-D_GNU_SOURCE -DCF_CHARACTERSET_DATA_DIR="CoreFoundation/CharacterSets"' foundation.LDFLAGS = '${SWIFT_USE_LINKER} -lswiftGlibc -Wl,-Bsymbolic ' Configuration.current.requires_pkg_config = True elif Configuration.current.target.sdk == OSType.FreeBSD: @@ -24,7 +24,7 @@ elif Configuration.current.target.sdk == OSType.MacOSX: foundation.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CoreFoundation/CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r ' elif Configuration.current.target.sdk == OSType.Win32 and Configuration.current.target.environ == EnvironmentType.Cygnus: - foundation.CFLAGS = '-DDEPLOYMENT_TARGET_LINUX -D_GNU_SOURCE -mcmodel=large ' + foundation.CFLAGS = '-D_GNU_SOURCE -mcmodel=large ' foundation.LDFLAGS = '${SWIFT_USE_LINKER} -lswiftGlibc `icu-config --ldflags` -Wl,--allow-multiple-definition ' swift_cflags += ['-DCYGWIN'] From 9c399977537e2e4764592aa1d3cb3df8d883ad04 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 12:25:14 -0700 Subject: [PATCH 07/10] TARGET_OS_OSX || TARGET_OS_IPHONE -> TARGET_OS_MAC --- CoreFoundation/Base.subproj/CFBase.c | 32 +++---- CoreFoundation/Base.subproj/CFFileUtilities.c | 4 +- CoreFoundation/Base.subproj/CFInternal.h | 10 +- .../Base.subproj/CFKnownLocations.c | 2 +- CoreFoundation/Base.subproj/CFPlatform.c | 30 +++--- CoreFoundation/Base.subproj/CFRuntime.c | 16 ++-- .../Base.subproj/CFSystemDirectories.c | 2 +- CoreFoundation/Base.subproj/CFUUID.c | 2 +- CoreFoundation/Base.subproj/CFUtilities.c | 44 ++++----- .../Base.subproj/CoreFoundation_Prefix.h | 4 +- .../Base.subproj/ForFoundationOnly.h | 12 +-- .../Collections.subproj/CFBasicHash.c | 2 +- CoreFoundation/Collections.subproj/CFData.c | 2 +- .../Collections.subproj/CFStorage.c | 2 +- CoreFoundation/Error.subproj/CFError.c | 14 +-- .../Locale.subproj/CFDateFormatter.c | 4 +- CoreFoundation/Locale.subproj/CFLocale.c | 92 +++++++++---------- .../Locale.subproj/CFLocaleIdentifier.c | 18 ++-- CoreFoundation/NumberDate.subproj/CFDate.c | 18 ++-- CoreFoundation/NumberDate.subproj/CFNumber.c | 2 +- .../Parsing.subproj/CFPropertyList.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle.c | 6 +- .../PlugIn.subproj/CFBundle_Binary.c | 4 +- .../PlugIn.subproj/CFBundle_Executable.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle_Grok.c | 2 +- .../PlugIn.subproj/CFBundle_Resources.c | 4 +- .../PlugIn.subproj/CFBundle_Tables.c | 2 +- .../CFApplicationPreferences.c | 2 +- .../RunLoop.subproj/CFMessagePort.c | 2 +- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 38 ++++---- CoreFoundation/RunLoop.subproj/CFSocket.c | 26 +++--- .../Stream.subproj/CFConcreteStreams.c | 6 +- .../Stream.subproj/CFSocketStream.c | 6 +- CoreFoundation/Stream.subproj/CFStream.c | 2 +- CoreFoundation/String.subproj/CFBurstTrie.c | 2 +- CoreFoundation/String.subproj/CFString.c | 22 ++--- .../String.subproj/CFStringEncodings.c | 4 +- .../String.subproj/CFStringUtilities.c | 24 ++--- .../StringEncodings.subproj/CFICUConverters.c | 2 +- .../CFPlatformConverters.c | 6 +- .../CFStringEncodingConverter.c | 14 +-- .../StringEncodings.subproj/CFUniChar.c | 24 ++--- CoreFoundation/URL.subproj/CFURL.c | 40 ++++---- CoreFoundation/URL.subproj/CFURL.inc.h | 2 +- CoreFoundation/URL.subproj/CFURLAccess.c | 8 +- 45 files changed, 282 insertions(+), 282 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFBase.c b/CoreFoundation/Base.subproj/CFBase.c index 6ba312b28d..b21378653d 100644 --- a/CoreFoundation/Base.subproj/CFBase.c +++ b/CoreFoundation/Base.subproj/CFBase.c @@ -17,7 +17,7 @@ #if _POSIX_THREADS #include #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #include @@ -29,7 +29,7 @@ struct __CFAllocator { CFRuntimeBase _base; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // CFAllocator structure must match struct _malloc_zone_t! // The first two reserved fields in struct _malloc_zone_t are for us with CFRuntimeBase size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */ @@ -465,7 +465,7 @@ void CFAllocatorSetDefault(CFAllocatorRef allocator) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; // require allocator to this function to be an allocator } @@ -491,7 +491,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC CFAllocatorRetainCallBack retainFunc; CFAllocatorAllocateCallBack allocateFunc; void *retainedInfo; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator && kCFAllocatorUseContext != allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return NULL; // require allocator to this function to be an allocator } @@ -525,7 +525,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC memset(memory, 0, sizeof(CFRuntimeBase)); __CFRuntimeSetRC(memory, 1); _CFAllocatorSetInstanceTypeIDAndIsa(memory); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC memory->size = __CFAllocatorCustomSize; memory->malloc = __CFAllocatorCustomMalloc; memory->calloc = __CFAllocatorCustomCalloc; @@ -574,7 +574,7 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -605,7 +605,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -613,7 +613,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif if (NULL == ptr && 0 < newsize) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_malloc((malloc_zone_t *)allocator, newsize); } @@ -626,7 +626,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return newptr; } if (NULL != ptr && 0 == newsize) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -643,7 +643,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize return NULL; } if (NULL == ptr && 0 == newsize) return NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_zone_realloc((malloc_zone_t *)allocator, ptr, newsize); } @@ -661,14 +661,14 @@ void CFAllocatorDeallocate(CFAllocatorRef allocator, void *ptr) { allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * #if defined(DEBUG) size_t size = malloc_size(ptr); @@ -691,14 +691,14 @@ CFIndex CFAllocatorGetPreferredSizeForSize(CFAllocatorRef allocator, CFIndex siz allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } #else __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return malloc_good_size(size); } @@ -716,7 +716,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context allocator = __CFGetDefaultAllocator(); } -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC if (allocator->_base._cfisa == __CFISAForCFAllocator()) { __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); } @@ -724,7 +724,7 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context __CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator); #endif CFAssert1(0 == context->version, __kCFLogAssertion, "%s(): context version not initialized to 0", __PRETTY_FUNCTION__); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t * return; } diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index b66e3f1134..d2d05423f1 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, FindClose(handle); pathBuf[pathLength] = '\0'; -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#elif TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD uint8_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla if (dent->d_type == DT_DIR) { isDirectory = true; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD else if (dent->d_type == DT_UNKNOWN) { // We need to do an additional stat on this to see if it's really a directory or not. // This path should be uncommon. diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index c1d17a9c5f..ba3aabfc6f 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -166,7 +166,7 @@ CF_EXPORT CFArrayRef _CFGetWindowsBinaryDirectories(void); CF_EXPORT CFStringRef _CFStringCreateHostName(void); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include CF_EXPORT void _CFMachPortInstallNotifyPort(CFRunLoopRef rl, CFStringRef mode); #endif @@ -678,7 +678,7 @@ CF_PRIVATE void _CF_dispatch_once(dispatch_once_t *, void (^)(void)); #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE _Atomic(uint8_t) __CF120293; CF_PRIVATE _Atomic(uint8_t) __CF120290; extern void __THE_PROCESS_HAS_FORKED_AND_YOU_CANNOT_USE_THIS_COREFOUNDATION_FUNCTIONALITY___YOU_MUST_EXEC__(void); @@ -856,7 +856,7 @@ CF_INLINE uintptr_t __CFISAForTypeID(CFTypeID typeID) { // DEFINE_WEAK_CARBONCORE_FUNC(void, DisposeHandle, (Handle h), (h)) // -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC extern void *__CFLookupCFNetworkFunction(const char *name); @@ -881,7 +881,7 @@ extern void *__CFLookupCFNetworkFunction(const char *name); #define DEFINE_WEAK_CARBONCORE_FUNC(R, N, P, A, ...) -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC extern void *__CFLookupCoreServicesInternalFunction(const char *name); @@ -1083,7 +1083,7 @@ CF_PRIVATE uint8_t *_CFDataGetBytePtrNonObjC(CFDataRef data); #pragma mark - #pragma mark CF Instruments SPI -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC extern void __CFRecordAllocationEvent(int eventnum, void *ptr, int64_t size, uint64_t data, const char *classname); #else #define __CFRecordAllocationEvent(a, b, c, d, e) ((void)0) diff --git a/CoreFoundation/Base.subproj/CFKnownLocations.c b/CoreFoundation/Base.subproj/CFKnownLocations.c index 958b5a1831..f05485a130 100644 --- a/CoreFoundation/Base.subproj/CFKnownLocations.c +++ b/CoreFoundation/Base.subproj/CFKnownLocations.c @@ -18,7 +18,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUser user, CFStringRef _Nullable username) { CFURLRef location = NULL; -#if (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if TARGET_OS_MAC /* Building for a Darwin OS. (We use these paths on Swift builds as well, so that we can interoperate a little with Darwin's defaults(1) command and the other system facilities; but you want to use the system version of CF if possible on those platforms, which will talk to cfprefsd(8) and has stronger interprocess consistency guarantees.) diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index ba4fc4fe05..120f28cc81 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -11,7 +11,7 @@ #include "CFInternal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #include @@ -35,7 +35,7 @@ #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS #define kCFPlatformInterfaceStringEncoding kCFStringEncodingUTF8 #else #define kCFPlatformInterfaceStringEncoding CFStringGetSystemEncoding() @@ -43,7 +43,7 @@ extern void __CFGetUGIDs(uid_t *euid, gid_t *egid); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // CoreGraphics and LaunchServices are only projects (1 Dec 2006) that use these char **_CFArgv(void) { return *_NSGetArgv(); } int _CFArgc(void) { return *_NSGetArgc(); } @@ -126,13 +126,13 @@ const char *_CFProcessPath(void) { } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) { return pthread_main_np() == 1; } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC const char *_CFProcessPath(void) { if (__CFProcessPath) return __CFProcessPath; #if TARGET_OS_OSX @@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) { } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #include #include @@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) { CF_EXPORT CFStringRef CFCopyUserName(void) { CFStringRef result = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD uid_t euid; __CFGetUGIDs(&euid, NULL); struct passwd *upwd = getpwuid(euid ? euid : getuid()); @@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); #elif DEPLOYMENT_TARGET_WINDOWS CFURLRef retVal = NULL; @@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD if (!uName) { return _CFCopyHomeDirURLForUser(NULL, true); } else { @@ -612,7 +612,7 @@ CF_PRIVATE void __CFTSDInitialize() { #endif static void __CFTSDSetSpecific(void *arg) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC pthread_setspecific(__CFTSDIndexKey, arg); #elif TARGET_OS_LINUX pthread_setspecific(__CFTSDIndexKey, arg); @@ -622,7 +622,7 @@ static void __CFTSDSetSpecific(void *arg) { } static void *__CFTSDGetSpecific() { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC return pthread_getspecific(__CFTSDIndexKey); #elif TARGET_OS_LINUX return pthread_getspecific(__CFTSDIndexKey); @@ -674,7 +674,7 @@ static void __CFTSDFinalize(void *arg) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC extern int pthread_key_init_np(int, void (*)(void *)); #endif @@ -1463,7 +1463,7 @@ typedef struct tagTHREADNAME_INFO #endif CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_Nonnull name) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (pthread_equal(pthread_self(), thread)) { return pthread_setname_np(name); } @@ -1489,7 +1489,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ } CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC return pthread_getname_np(pthread_self(), buf, length); #elif TARGET_OS_LINUX return pthread_getname_np(pthread_self(), buf, length); @@ -1498,7 +1498,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { } CF_EXPORT char **_CFEnviron(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC return *_NSGetEnviron(); #elif DEPLOYMENT_TARGET_WINDOWS return _environ; diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 97d91704d4..2777d8beb8 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -21,7 +21,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #include @@ -60,7 +60,7 @@ __kCFReleaseEvent = 29 #define FAKE_INSTRUMENTS 0 -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE void __CFOAInitializeNSObject(void); // from NSObject.m bool __CFOASafe = false; @@ -404,7 +404,7 @@ CF_INLINE uint32_t __CFHighRCFromInfo(__CFInfoType info) { CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const char *className) { CFRuntimeBase *memory; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC memory = malloc_zone_memalign(malloc_default_zone(), align, size); #elif TARGET_OS_LINUX int result = posix_memalign((void **)&memory, /*alignment*/ align, size); @@ -971,7 +971,7 @@ CF_PRIVATE void __CFTSDWindowsCleanup(void); CF_PRIVATE void __CFFinalizeWindowsThreadData(); #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC _Atomic(uint8_t) __CF120290 = false; static _Atomic(uint8_t) __CF120291 = false; _Atomic(uint8_t) __CF120293 = false; @@ -1145,7 +1145,7 @@ void __CFInitialize(void) { } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC UInt32 s, r; __CFStringGetUserDefaultEncoding(&s, &r); // force the potential setenv to occur early pthread_atfork(__01121__, NULL, __01123__); @@ -1162,7 +1162,7 @@ void __CFInitialize(void) { #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC { CFIndex idx, cnt; char **args = *_NSGetArgv(); @@ -1205,7 +1205,7 @@ void __CFInitialize(void) { { CFIndex idx, cnt = 0; char **args = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC args = *_NSGetArgv(); cnt = *_NSGetArgc(); #elif DEPLOYMENT_TARGET_WINDOWS @@ -1256,7 +1256,7 @@ void __CFInitialize(void) { if (value && (*value == 'Y' || *value == 'y')) __CFDeallocateZombies = 0xff; #endif -#if defined(DEBUG) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if defined(DEBUG) && TARGET_OS_MAC CFLog(kCFLogLevelWarning, CFSTR("Assertions enabled")); #endif diff --git a/CoreFoundation/Base.subproj/CFSystemDirectories.c b/CoreFoundation/Base.subproj/CFSystemDirectories.c index 991abf47fb..542f376bc5 100644 --- a/CoreFoundation/Base.subproj/CFSystemDirectories.c +++ b/CoreFoundation/Base.subproj/CFSystemDirectories.c @@ -52,7 +52,7 @@ CFSearchPathEnumerationState __CFGetNextSearchPathEnumeration(CFSearchPathEnumer #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde) { CFMutableArrayRef array; diff --git a/CoreFoundation/Base.subproj/CFUUID.c b/CoreFoundation/Base.subproj/CFUUID.c index 058387756c..cff9f1e7cc 100644 --- a/CoreFoundation/Base.subproj/CFUUID.c +++ b/CoreFoundation/Base.subproj/CFUUID.c @@ -151,7 +151,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) { long rStatus = UuidCreate(&u); if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1; memmove(&bytes, &u, sizeof(bytes)); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#elif TARGET_OS_MAC || TARGET_OS_LINUX static Boolean useV1UUIDs = false, checked = false; uuid_t uuid; if (!checked) { diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index 3301413c5c..b4190a16a6 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -14,7 +14,7 @@ #include "CFLocaleInternal.h" #include "CFBundle_Internal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS #include #endif #include @@ -29,7 +29,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #else #define ASL_LEVEL_EMERG 0 @@ -37,7 +37,7 @@ #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #include @@ -159,7 +159,7 @@ CFHashCode CFHashBytes(uint8_t *bytes, CFIndex length) { #undef ELF_STEP -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE uintptr_t __CFFindPointer(uintptr_t ptr, uintptr_t start) { vm_map_t task = mach_task_self(); mach_vm_address_t address = start; @@ -225,7 +225,7 @@ static CFStringRef copySystemVersionPath(CFStringRef suffix) { // Looks for localized version of "nonLocalized" in the SystemVersion bundle // If not found, and returnNonLocalizedFlag == true, will return the non localized string (retained of course), otherwise NULL // If bundlePtr != NULL, will use *bundlePtr and will return the bundle in there; otherwise bundle is created and released -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRef nonLocalized) { CFStringRef localized = NULL; CFBundleRef locBundle = bundlePtr ? *bundlePtr : NULL; @@ -249,7 +249,7 @@ static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRe static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) { CFPropertyListRef plist = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CFDataRef data; CFURLRef url; @@ -392,7 +392,7 @@ CF_PRIVATE void *__CFLookupCarbonCoreFunction(const char *name) { } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE void *__CFLookupCoreServicesInternalFunction(const char *name) { static void *image = NULL; static dispatch_once_t onceToken; @@ -441,7 +441,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL); v = (v + (v >> 4)) & 0xf0f0f0f0f0f0f0fULL; pcnt = (v * 0x0101010101010101ULL) >> ((sizeof(v) - 1) * 8); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE +#elif TARGET_OS_MAC int32_t mib[] = {CTL_HW, HW_AVAILCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -468,7 +468,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { CF_PRIVATE CFIndex __CFProcessorCount() { int32_t pcnt; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(pcnt); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &pcnt, &len, NULL, 0); @@ -486,7 +486,7 @@ CF_PRIVATE CFIndex __CFProcessorCount() { CF_PRIVATE uint64_t __CFMemorySize() { uint64_t memsize = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC int32_t mib[] = {CTL_HW, HW_NCPU}; size_t len = sizeof(memsize); int32_t result = sysctl(mib, sizeof(mib) / sizeof(int32_t), &memsize, &len, NULL, 0); @@ -550,7 +550,7 @@ typedef struct _ugids { CF_PRIVATE void __CFGetUGIDs(uid_t *euid, gid_t *egid) { ugids(^lookup)(void) = ^{ ugids ids; -#if 1 && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if 1 && TARGET_OS_MAC if (0 != pthread_getugid_np(&ids._euid, &ids._egid)) #endif { @@ -672,7 +672,7 @@ static void _CFShowToFile(FILE *file, Boolean flush, const void *obj) { } } if (!lastNL) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC fprintf_l(file, NULL, "\n"); #else fprintf(file, "\n"); @@ -692,7 +692,7 @@ void CFShow(const void *obj) { // message must be a UTF8-encoded, null-terminated, byte buffer with at least length bytes typedef void (*CFLogFunc)(int32_t lev, const char *message, size_t length, char withBanner); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static Boolean debugger_attached() { BOOL debuggerAttached = NO; struct proc_bsdshortinfo info; @@ -715,7 +715,7 @@ static bool also_do_stderr(const _cf_logging_style style) { #if TARGET_OS_LINUX // just log to stderr, other logging facilities are out result = true; -#elif TARGET_OS_OSX || TARGET_OS_IPHONE +#elif TARGET_OS_MAC if (style == _cf_logging_style_os_log) { // // This might seem a bit odd, so an explanation is in order: @@ -791,7 +791,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann int32_t minute = mine.tm_min; int32_t second = mine.tm_sec; int32_t ms = (int32_t)floor(1000.0 * modf(at, &dummy)); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%llu] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), tid); @@ -807,7 +807,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann } static void _logToStderr(char *banner, const char *message, size_t length) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC struct iovec v[3]; v[0].iov_base = banner; v[0].iov_len = banner ? strlen(banner) : 0; @@ -889,7 +889,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length _populateBanner(&banner, &time, &thread, &bannerLen); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" uid_t euid; @@ -921,7 +921,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(void *, const void *), CFStringRef (*contextDescFunc)(void *, const void *, const void *, bool, bool *), CFDictionaryRef formatOptions, int32_t lev, CFStringRef format, va_list args, _cf_logging_style loggingStyle) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC uintptr_t val = (uintptr_t)_CFGetTSD(__CFTSDKeyIsInCFLog); if (3 < val) return; // allow up to 4 nested invocations _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)(val + 1), NULL); @@ -947,7 +947,7 @@ static void _CFLogvEx2Predicate(CFLogFunc logit, CFStringRef (*copyDescFunc)(voi } if (buf) free(buf); if (str) CFRelease(str); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC _CFSetTSD(__CFTSDKeyIsInCFLog, (void *)val, NULL); #endif } @@ -1037,7 +1037,7 @@ void CFLog1(CFLogLevel lev, CFStringRef message) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC kern_return_t _CFDiscorporateMemoryAllocate(CFDiscorporateMemory *hm, size_t size, bool purgeable) { kern_return_t ret = KERN_SUCCESS; @@ -1201,7 +1201,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (errorPtr) *errorPtr = _CFErrorWithFilePathCodeDomain(kCFErrorDomainPOSIX, errno, path); return false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (uncached) (void)fcntl(fd, F_NOCACHE, 1); // Non-zero arg turns off caching; we ignore error as uncached is just a hint #endif if (fstat(fd, &statBuf) < 0) { @@ -1232,7 +1232,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean if (0LL == statBuf.st_size) { bytes = malloc(8); // don't return constant string -- it's freed! length = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD } else if (map) { if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) { int32_t savederrno = errno; diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index 18c785c960..026a0f3718 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -45,7 +45,7 @@ extern "C" { #define pthread_set_qos_class_self_np(A, B) do {} while (0) #define pthread_override_qos_class_start_np(A, B, C) (NULL) #define pthread_override_qos_class_end_np(A) do {} while (0) -#elif (TARGET_OS_OSX || TARGET_OS_IPHONE) +#elif TARGET_OS_MAC #include #include #endif @@ -73,7 +73,7 @@ typedef char * Class; #define CRSetCrashLogMessage(A) do {} while (0) #define CRSetCrashLogMessage2(A) do {} while (0) -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #endif diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index b9174de20f..872db53500 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -50,12 +50,12 @@ CF_IMPLICIT_BRIDGING_DISABLED #include #elif TARGET_OS_BSD #include // malloc() -#elif TARGET_OS_OSX || TARGET_OS_IPHONE +#elif TARGET_OS_MAC #include #include #endif -#if (INCLUDE_OBJC || TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT +#if (INCLUDE_OBJC || TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT #include #endif @@ -465,7 +465,7 @@ CF_EXPORT const void *_CFArrayCheckAndGetValueAtIndex(CFArrayRef array, CFIndex CF_EXPORT void _CFArrayReplaceValues(CFMutableArrayRef array, CFRange range, const void *_Nullable * _Nullable newValues, CFIndex newCount); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC /* Enumeration Call CFStartSearchPathEnumeration() once, then call CFGetNextSearchPathEnumeration() one or more times with the returned state. @@ -545,7 +545,7 @@ CF_EXPORT Boolean _CFRunLoopIsCurrent(CFRunLoopRef rl); CF_EXPORT CFIndex _CFStreamInstanceSize(void); CF_EXPORT CFReadStreamRef CFReadStreamCreateWithData(_Nullable CFAllocatorRef alloc, CFDataRef data); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC typedef struct { mach_vm_address_t address; mach_vm_size_t size; @@ -572,7 +572,7 @@ CF_CROSS_PLATFORM_EXPORT void _CFDataInit(CFMutableDataRef memory, CFOptionFlags CF_EXPORT CFRange _CFDataFindBytes(CFDataRef data, CFDataRef dataToFind, CFRange searchRange, CFDataSearchFlags compareOptions); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #if !defined(__CFReadTSR) #define __CFReadTSR() mach_absolute_time() #endif @@ -586,7 +586,7 @@ CF_INLINE UInt64 __CFReadTSR(void) { #endif #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC /* Identical to CFStringGetFileSystemRepresentation, but returns additional information about the failure. */ diff --git a/CoreFoundation/Collections.subproj/CFBasicHash.c b/CoreFoundation/Collections.subproj/CFBasicHash.c index a585ffe886..82bdfdbafa 100644 --- a/CoreFoundation/Collections.subproj/CFBasicHash.c +++ b/CoreFoundation/Collections.subproj/CFBasicHash.c @@ -20,7 +20,7 @@ #endif #include "CFOverflow.h" -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define __SetLastAllocationEventName(A, B) do { if (__CFOASafe && (A)) __CFSetLastAllocationEventName(A, B); } while (0) #else #define __SetLastAllocationEventName(A, B) do { } while (0) diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index 0a52f45da3..8e113dcea2 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -34,7 +34,7 @@ static Boolean _CFDataShouldBridgeToSwift(CFTypeID type, CFDataRef data); #define CFDATA_MAX_SIZE ((1ULL << 31) - 1) #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include CF_INLINE unsigned long __CFPageSize() { return vm_page_size; } #elif DEPLOYMENT_TARGET_WINDOWS diff --git a/CoreFoundation/Collections.subproj/CFStorage.c b/CoreFoundation/Collections.subproj/CFStorage.c index 664f544faf..e33e572eae 100644 --- a/CoreFoundation/Collections.subproj/CFStorage.c +++ b/CoreFoundation/Collections.subproj/CFStorage.c @@ -1091,7 +1091,7 @@ CFStorageRef CFStorageCreate(CFAllocatorRef allocator, CFIndex valueSize) { storage->valueSize = valueSize; /* if valueSize is a power of 2, then set the shifter to the log base 2 of valueSize. Otherwise set it to NO_SHIFTER */ if (valueSize > 0 && !(valueSize & (valueSize - 1))) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC storage->byteToValueShifter = __builtin_ctzl(valueSize); #else CFIndex tempSize = valueSize; diff --git a/CoreFoundation/Error.subproj/CFError.c b/CoreFoundation/Error.subproj/CFError.c index 7f1eadb22e..8e185e5431 100644 --- a/CoreFoundation/Error.subproj/CFError.c +++ b/CoreFoundation/Error.subproj/CFError.c @@ -14,7 +14,7 @@ #include "CFRuntime_Internal.h" #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #endif @@ -250,7 +250,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { if (reason) { CFStringRef const backstopComboString = CFSTR("%@ %@"); CFStringRef comboString = backstopComboString; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (cfBundle) comboString = CFCopyLocalizedStringFromTableInBundle(CFSTR("%@ %@"), CFSTR("Error"), cfBundle, "Used for presenting the 'what failed' and 'why it failed' sections of an error message, where each one is one or more complete sentences. The first %@ corresponds to the 'what failed' (For instance 'The file could not be saved.') and the second one 'why it failed' (For instance 'The volume is out of space.')"); #endif @@ -265,7 +265,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS // Cache the CF bundle since we will be using it for localized strings. Note that for platforms without bundle support we also go this non-localized route. CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (!cfBundle) { // This should be rare, but has been observed in the wild, due to running out of file descriptors. Normally we might not go to such extremes, but since we want to be able to present reasonable errors even in the case of errors such as running out of file descriptors, why not. This is CFError after all. !!! Be sure to have the same logic here as below for going through various options for fetching the strings. @@ -281,7 +281,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } if (reasonOrDesc) CFRelease(reasonOrDesc); return result; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS } // Then look for kCFErrorLocalizedFailureReasonKey; if there, create a full sentence from that. @@ -495,7 +495,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR if (!errStr) return NULL; if (CFEqual(key, kCFErrorDescriptionKey)) return errStr; // If all we wanted was the non-localized description, we're done -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // We need a kCFErrorLocalizedFailureReasonKey, so look up a possible localization for the error message // Look for the bundle in /System/Library/CoreServices/CoreTypes.bundle CFArrayRef paths = CFCopySearchPathForDirectoriesInDomains(kCFLibraryDirectory, kCFSystemDomainMask, false); @@ -534,7 +534,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR return errStr; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC /* Built-in callback for Mach domain. */ static CFTypeRef _CFErrorMachCallBack(CFErrorRef err, CFStringRef key) CF_RETURNS_RETAINED { @@ -565,7 +565,7 @@ static void _CFErrorInitializeCallBackTable(void) { _CFErrorCallBackTable = table; // Register the known providers, going thru a special variant of the function that doesn't lock __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainPOSIX, _CFErrorPOSIXCallBack); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC __CFErrorSetCallBackForDomainNoLock(kCFErrorDomainMach, _CFErrorMachCallBack); #endif __CFUnlock(&_CFErrorSpinlock); diff --git a/CoreFoundation/Locale.subproj/CFDateFormatter.c b/CoreFoundation/Locale.subproj/CFDateFormatter.c index 3d023733fa..df3920b807 100644 --- a/CoreFoundation/Locale.subproj/CFDateFormatter.c +++ b/CoreFoundation/Locale.subproj/CFDateFormatter.c @@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) { int32_t years = 0; __cficu_ucal_clear(calendar); @@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter } } } else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX __cficu_ucal_clear(cal); __cficu_ucal_set(cal, UCAL_ERA, 1); __cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status); diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index 342deecc97..dee357cfaa 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include @@ -298,7 +298,7 @@ static void _setCachedCurrentLocale(CFLocaleRef newLocale) { #define FALLBACK_LOCALE_NAME CFSTR("en_US") #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS static CFStringRef _CFLocaleCopyLocaleIdentifierByAddingLikelySubtags(CFStringRef localeID) { CFStringRef result = NULL; @@ -526,7 +526,7 @@ CFStringRef _CFLocaleCreateLocaleIdentiferByReplacingLanguageCodeAndScriptCode(C } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray); /// Creates a new locale identifier by identifying the most preferred localization (using `availableLocalizations` and `preferredLanguages`) and then creating a locale based on the most preferred localization, while retaining any relevant attributes from `preferredLocaleID`, e.g. if `availableLocalizations` is `[ "en", "fr", "de" ]`, `preferredLanguages` is `[ "ar-AE", "en-AE" ]`, `preferredLocaleID` is `ar_AE@numbers=arab;calendar=islamic-civil`, it will return `en_AE@calendar=islamic-civil`, i.e. the language will be matched to `en` since that’s the only available localization that matches, `calendar` will be retained since it’s language-agnostic, but `numbers` will be discarded because the `arab` numbering system is not valid for `en`. @@ -585,7 +585,7 @@ static CFLocaleRef _CFLocaleCopyCurrentGuts(CFStringRef name, Boolean useCache, // things which call this function thousands or millions of times in // a short period. if (!name) { -#if 0 // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if 0 // TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX name = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication); #endif } else { @@ -891,7 +891,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C langPref = (CFArrayRef)CFDictionaryGetValue(displayLocale->_prefs, CFSTR("AppleLanguages")); if (langPref) CFRetain(langPref); } else { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX langPref = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); #endif } @@ -916,7 +916,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C } CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX int32_t locale, localeCount = uloc_countAvailable(); CFMutableSetRef working = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeSetCallBacks); for (locale = 0; locale < localeCount; ++locale) { @@ -937,7 +937,7 @@ CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static CFArrayRef __CFLocaleCopyCStringsAsArray(const char* const* p) { CFMutableArrayRef working = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); for (; *p; ++p) { @@ -977,7 +977,7 @@ static CFArrayRef __CFLocaleCopyUEnumerationAsArray(UEnumeration *enumer, UError #endif CFArrayRef CFLocaleCopyISOLanguageCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX const char* const* p = uloc_getISOLanguages(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -986,7 +986,7 @@ CFArrayRef CFLocaleCopyISOLanguageCodes(void) { } CFArrayRef CFLocaleCopyISOCountryCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX const char* const* p = uloc_getISOCountries(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -995,7 +995,7 @@ CFArrayRef CFLocaleCopyISOCountryCodes(void) { } CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_ALL, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1007,7 +1007,7 @@ CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { } CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_COMMON|UCURR_NON_DEPRECATED, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1019,7 +1019,7 @@ CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { } CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef allocator, uint32_t lcid) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char buffer[kMaxICUNameSize]; UErrorCode status = U_ZERO_ERROR; int32_t ret = uloc_getLocaleForLCID(lcid, buffer, kMaxICUNameSize, &status); @@ -1034,7 +1034,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef a } uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIdentifier) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringRef ident = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorSystemDefault, localeIdentifier); char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = ident ? CFStringGetCString(ident, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; @@ -1046,7 +1046,7 @@ uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIden } CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoLangCode) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1066,7 +1066,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoL } CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCode) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1086,7 +1086,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCo } _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC _CFLocaleCalendarDirection calendarDirection = _kCFLocaleCalendarDirectionLeftToRight; Boolean keyExistsAndHasValidFormat = false; Boolean calendarIsRightToLeft = CFPreferencesGetAppBooleanValue(CFSTR("NSLocaleCalendarDirectionIsRightToLeft"), kCFPreferencesAnyApplication, &keyExistsAndHasValidFormat); @@ -1118,7 +1118,7 @@ _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray) { CFMutableArrayRef newArray = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); if (languagesArray && (CFArrayGetTypeID() == CFGetTypeID(languagesArray))) { @@ -1138,7 +1138,7 @@ static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesA #endif CFArrayRef CFLocaleCopyPreferredLanguages(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS CFArrayRef languagesArray = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); CFArrayRef result = _CFLocaleCopyPreferredLanguagesFromPrefs(languagesArray); if (languagesArray) CFRelease(languagesArray); @@ -1180,7 +1180,7 @@ static bool __CFLocaleCopyCodes(CFLocaleRef locale, bool user, CFTypeRef *cf, CF return false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { UErrorCode icuErr = U_ZERO_ERROR; CFMutableCharacterSetRef working = CFCharacterSetCreateMutable(NULL); @@ -1236,7 +1236,7 @@ CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { #endif static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1257,7 +1257,7 @@ static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1275,7 +1275,7 @@ static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyICUCalendarID(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1360,7 +1360,7 @@ static bool __CFLocaleCopyCalendarID(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (__CFLocaleCopyCalendarID(locale, user, cf, context)) { CFCalendarRef calendar = _CFCalendarCreateCoWWithIdentifier((CFStringRef)*cf); CFCalendarSetLocale(calendar, locale); @@ -1394,7 +1394,7 @@ static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, } static bool __CFLocaleCopyDelimiter(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX ULocaleDataDelimiterType type = (ULocaleDataDelimiterType)0; if (context == kCFLocaleQuotationBeginDelimiterKey) { type = ULOCDATA_QUOTATION_START; @@ -1465,7 +1465,7 @@ static bool __CFLocaleCopyCollatorID(CFLocaleRef locale, bool user, CFTypeRef *c return canonLocaleCFStr ? true : false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC STATIC_CONST_STRING_DECL(_metricUnitsKey, "AppleMetricUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsKey, "AppleMeasurementUnits"); STATIC_CONST_STRING_DECL(_measurementUnitsCentimeters, "Centimeters"); @@ -1496,7 +1496,7 @@ static void __CFLocaleGetPreferencesForMeasurementSystem(UMeasurementSystem meas } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && (TARGET_OS_OSX || TARGET_OS_IPHONE) +#if (U_ICU_VERSION_MAJOR_NUM > 54 || !defined(CF_OPEN_SOURCE)) && TARGET_OS_MAC static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, bool *outCelsius) { if (temperaturePref) { if (CFEqual(temperaturePref, kCFLocaleTemperatureUnitCelsius)) { @@ -1511,13 +1511,13 @@ static bool _CFLocaleGetTemperatureUnitForPreferences(CFTypeRef temperaturePref, } #endif -#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && (TARGET_OS_OSX || TARGET_OS_IPHONE)) +#if (U_ICU_VERSION_MAJOR_NUM > 54) || (!defined(CF_OPEN_SOURCE) && TARGET_OS_MAC) static CFStringRef _CFLocaleGetTemperatureUnitName(bool celsius) { return celsius? kCFLocaleTemperatureUnitCelsius: kCFLocaleTemperatureUnitFahrenheit; } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" @@ -1560,11 +1560,11 @@ static bool __CFLocaleGetMeasurementSystemForName(CFStringRef name, UMeasuremen #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UMeasurementSystem *outMeasurementSystem) { UMeasurementSystem output = UMS_SI; // Default is Metric bool done = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (user) { CFTypeRef metricPref = CFDictionaryGetValue(locale->_prefs, _metricUnitsKey); CFTypeRef measurementPref = CFDictionaryGetValue(locale->_prefs, _measurementUnitsKey); @@ -1590,7 +1590,7 @@ static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UM static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = system != UMS_US ? kCFBooleanTrue : kCFBooleanFalse; @@ -1602,7 +1602,7 @@ static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyMeasurementSystem(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = CFRetain(__CFLocaleGetMeasurementSystemName(system)); @@ -1619,13 +1619,13 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR #if U_ICU_VERSION_MAJOR_NUM > 54 bool celsius = true; // Default is Celsius bool done = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (user) { CFTypeRef temperatureUnitPref = CFDictionaryGetValue(locale->_prefs, _temperatureUnitKey); done = _CFLocaleGetTemperatureUnitForPreferences(temperatureUnitPref, &celsius); } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (!done) { char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1663,7 +1663,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterDecimalStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1679,7 +1679,7 @@ static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef // so we have to have another routine here which creates a Currency number formatter. static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterCurrencyStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1691,7 +1691,7 @@ static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef return false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX typedef int32_t (*__CFICUFunction)(const char *, const char *, UChar *, int32_t, UErrorCode *); static bool __CFLocaleICUName(const char *locale, const char *valLocale, CFStringRef *out, __CFICUFunction icu) { @@ -1763,7 +1763,7 @@ static bool __CFLocaleICUCurrencyName(const char *locale, const char *value, UCu #endif static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; int32_t size; UChar name[kMaxICUNameSize]; @@ -1796,7 +1796,7 @@ static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRe } static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUName(locale, value, out, uloc_getDisplayLanguage); #else *out = CFRetain(CFSTR("(none)")); @@ -1805,7 +1805,7 @@ static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStri } static bool __CFLocaleCountryName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) < sizeof(lid) - 3) { @@ -1821,7 +1821,7 @@ static bool __CFLocaleCountryName(const char *locale, const char *value, CFStrin } static bool __CFLocaleScriptName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) == 4) { @@ -1838,7 +1838,7 @@ static bool __CFLocaleScriptName(const char *locale, const char *value, CFString } static bool __CFLocaleVariantName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (strlen(value) < sizeof(lid) - 6) { @@ -1854,7 +1854,7 @@ static bool __CFLocaleVariantName(const char *locale, const char *value, CFStrin } static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCalendarKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1863,7 +1863,7 @@ static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStri } static bool __CFLocaleCollationName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCollationKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1872,7 +1872,7 @@ static bool __CFLocaleCollationName(const char *locale, const char *value, CFStr } static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_SYMBOL_NAME, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1881,7 +1881,7 @@ static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, C } static bool __CFLocaleCurrencyFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_LONG_NAME, out); #else *out = CFRetain(CFSTR("(none)")); diff --git a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c index c47cd16f59..21a256be15 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c +++ b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c @@ -58,7 +58,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include #else #define ULOC_KEYWORD_SEPARATOR '@' @@ -1155,7 +1155,7 @@ enum { }; */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX struct LocaleToLegacyCodes { const char * locale; // reduced to language plus one other component (script, region, variant), separators normalized to'_' @@ -1593,7 +1593,7 @@ static void _UpdateFullLocaleString(char inLocaleString[], int locStringMaxLen, // If so, copy the keywords to varKeyValueString and delete the variant tag // from the original string (but don't otherwise use the ICU canonicalization). varKeyValueString[0] = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (variantTag) { UErrorCode icuStatus; int icuCanonStringLen; @@ -1720,7 +1720,7 @@ static void _GetKeyValueString(char inLocaleString[], char keyValueString[]) { } static void _AppendKeyValueString(char inLocaleString[], int locStringMaxLen, char keyValueString[]) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (keyValueString[0] != 0) { UErrorCode uerr = U_ZERO_ERROR; UEnumeration * uenum = uloc_openKeywords(keyValueString, &uerr); @@ -1952,12 +1952,12 @@ SPI: CFLocaleGetLanguageRegionEncodingForLocaleIdentifier gets the appropriate preferred localization in the current context (this function returns NO for a NULL localeIdentifier); and in this function langCode, regCode, and scriptCode are all SInt16* (not SInt32* like the equivalent parameters in CFBundleGetLocalizationInfoForLocalization). */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ); #endif Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeIdentifier, LangCode *langCode, RegionCode *regCode, ScriptCode *scriptCode, CFStringEncoding *stringEncoding) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX Boolean returnValue = false; CFStringRef canonicalIdentifier = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, localeIdentifier); if (canonicalIdentifier) { @@ -2035,7 +2035,7 @@ Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeI #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ) { const char * localeString1 = ((const LocaleToLegacyCodes *)entry1)->locale; const char * localeString2 = ((const LocaleToLegacyCodes *)entry2)->locale; @@ -2045,7 +2045,7 @@ static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *en CFDictionaryRef CFLocaleCreateComponentsFromLocaleIdentifier(CFAllocatorRef allocator, CFStringRef localeID) { CFMutableDictionaryRef working = CFDictionaryCreateMutable(allocator, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX char cLocaleID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; char buffer[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -2175,7 +2175,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato free(variant); free(buf1); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX for (CFIndex idx = 0; idx < cnt; idx++) { if (keys[idx]) { char *key = __CStringFromString(keys[idx]); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index 744012da31..ca44fa2a82 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -26,7 +26,7 @@ #endif #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #include #endif @@ -111,7 +111,7 @@ CFAbsoluteTime CFAbsoluteTimeGetCurrent(void) { #if DEPLOYMENT_RUNTIME_SWIFT CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { CFDateGetTypeID(); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC uint64_t tsr = mach_absolute_time(); return (CFTimeInterval)((double)tsr * __CF1_TSRRate); #elif TARGET_OS_LINUX || TARGET_OS_BSD @@ -164,7 +164,7 @@ const CFRuntimeClass __CFDateClass = { }; CF_PRIVATE void __CFDateInitialize(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC struct mach_timebase_info info; mach_timebase_info(&info); __CFTSRRate = (1.0E9 / (double)info.numer) * (double)info.denom; @@ -360,7 +360,7 @@ CFAbsoluteTime CFGregorianDateGetAbsoluteTime(CFGregorianDate gdate, CFTimeZoneR CFAbsoluteTime at; at = 86400.0 * __CFAbsoluteFromYMD(gdate.year - 2001, gdate.month, gdate.day); at += 3600.0 * gdate.hour + 60.0 * gdate.minute + gdate.second; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -379,7 +379,7 @@ CFGregorianDate CFAbsoluteTimeGetGregorianDate(CFAbsoluteTime at, CFTimeZoneRef int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -407,7 +407,7 @@ CFAbsoluteTime CFAbsoluteTimeAddGregorianUnits(CFAbsoluteTime at, CFTimeZoneRef CFAbsoluteTime candidate_at0, candidate_at1; uint8_t monthdays; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -526,7 +526,7 @@ CFGregorianUnits CFAbsoluteTimeGetDifferenceAsGregorianUnits(CFAbsoluteTime at1, SInt32 CFAbsoluteTimeGetDayOfWeek(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -542,7 +542,7 @@ SInt32 CFAbsoluteTimeGetDayOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { CFAbsoluteTime fixedat; int64_t absolute, year; int8_t month, day; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -561,7 +561,7 @@ SInt32 CFAbsoluteTimeGetWeekOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index d3c2a61bcb..9f3f12ec2d 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -180,7 +180,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define BITSFORDOUBLEZERO doubleZeroBits.bits #define BITSFORDOUBLEONE doubleOneBits.bits -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L diff --git a/CoreFoundation/Parsing.subproj/CFPropertyList.c b/CoreFoundation/Parsing.subproj/CFPropertyList.c index 76f0eb38a4..fd2a8d5acf 100644 --- a/CoreFoundation/Parsing.subproj/CFPropertyList.c +++ b/CoreFoundation/Parsing.subproj/CFPropertyList.c @@ -2320,7 +2320,7 @@ static CFStringEncoding encodingForXMLData(CFDataRef data, CFErrorRef *error, CF if (len == 5 && (*base == 'u' || *base == 'U') && (base[1] == 't' || base[1] == 'T') && (base[2] == 'f' || base[2] == 'F') && (base[3] == '-') && (base[4] == '8')) return kCFStringEncodingUTF8; encodingName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, base, len, kCFStringEncodingISOLatin1, false); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringEncoding enc = CFStringConvertIANACharSetNameToEncoding(encodingName); if (enc != kCFStringEncodingInvalidId) { CFRelease(encodingName); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/CoreFoundation/PlugIn.subproj/CFBundle.c index 29e4c9f72d..f06ab0c90a 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle.c @@ -39,7 +39,7 @@ #endif #endif /* BINARY_SUPPORT_DLFCN */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #elif DEPLOYMENT_TARGET_WINDOWS #include @@ -512,7 +512,7 @@ CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } result = _CFBundleGetFromTables(bundleID); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); @@ -762,7 +762,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL, bundle->_sharesStringsFiles = false; bundle->_isUnique = unique; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (!__CFgetenv("CFBundleDisableStringsSharing") && (strncmp(buff, "/System/Library/Frameworks", 26) == 0) && (strncmp(buff + strlen(buff) - 10, ".framework", 10) == 0)) bundle->_sharesStringsFiles = true; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c index a691c93304..295d26a6cb 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Binary.c @@ -500,7 +500,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) retval = false; if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC retval = dlopen_preflight(buff); #endif if (!retval && error) { @@ -519,7 +519,7 @@ CF_EXPORT Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) if (hasSuitableArch) { uint32_t mainFlags = 0; if (_CFBundleGrokObjCImageInfoFromMainExecutable(NULL, &mainFlags) && (mainFlags & 0x2) != 0) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC uint32_t bundleFlags = 0; if (_CFBundleGetObjCImageInfo(bundle, NULL, &bundleFlags) && (bundleFlags & 0x2) == 0) hasRuntimeMismatch = true; #endif diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index f1e52119c7..8307882594 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -89,7 +89,7 @@ static CFURLRef _CFBundleCopyExecutableURLRaw(CFURLRef urlPath, CFStringRef exeN } } } -#elif TARGET_OS_OSX || TARGET_OS_IPHONE +#elif TARGET_OS_MAC const uint8_t *image_suffix = (uint8_t *)__CFgetenvIfNotRestricted("DYLD_IMAGE_SUFFIX"); if (image_suffix) { diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c index 615b17c441..ebd7dc1e7c 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c @@ -970,7 +970,7 @@ CF_PRIVATE CFArrayRef _CFBundleCopyArchitecturesForExecutable(CFURLRef url) { return result; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static Boolean _CFBundleGetObjCImageInfoForExecutable(CFURLRef url, uint32_t *objcVersion, uint32_t *objcFlags) { Boolean retval = false; (void)_CFBundleGrokFileType(url, NULL, NULL, NULL, NULL, NULL, &retval, objcVersion, objcFlags); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index e774121d7c..68aa36a185 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -25,7 +25,7 @@ #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX #include #if !TARGET_OS_ANDROID #include @@ -310,7 +310,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { } CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC return CFSTR("MacOS"); #elif DEPLOYMENT_TARGET_WINDOWS return CFSTR("Windows"); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c index 0ffc018baa..6405eea9c2 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Tables.c @@ -178,7 +178,7 @@ CF_EXPORT CFBundleRef CFBundleGetBundleWithIdentifier(CFStringRef bundleID) { } _CFMutexLock(&CFBundleGlobalDataLock); result = _CFBundlePrimitiveGetBundleWithIdentifierAlreadyLocked(bundleID); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (!result) { // Try to create the bundle for the caller and try again void *p = __builtin_return_address(0); diff --git a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c index e702e54125..37c9964cd2 100644 --- a/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c +++ b/CoreFoundation/Preferences.subproj/CFApplicationPreferences.c @@ -17,7 +17,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #endif diff --git a/CoreFoundation/RunLoop.subproj/CFMessagePort.c b/CoreFoundation/RunLoop.subproj/CFMessagePort.c index ab4d3de686..ad30bfbc08 100644 --- a/CoreFoundation/RunLoop.subproj/CFMessagePort.c +++ b/CoreFoundation/RunLoop.subproj/CFMessagePort.c @@ -28,7 +28,7 @@ #include #if __HAS_DISPATCH__ #include -#if (TARGET_OS_OSX || TARGET_OS_IPHONE) && __has_include() +#if TARGET_OS_MAC && __has_include() #include #endif #endif diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index 4216c679b4..e4365d200d 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -48,7 +48,7 @@ CF_INLINE uint64_t check_uint64_add(uint64_t x, uint64_t y, int32_t* err) { }; #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS #define USE_DISPATCH_SOURCE_FOR_TIMERS __HAS_DISPATCH__ #define USE_MK_TIMER_TOO 1 #else @@ -81,7 +81,7 @@ typedef HANDLE dispatch_runloop_handle_t; #endif #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_SIMULATOR +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_SIMULATOR #include #include #include @@ -225,7 +225,7 @@ static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; // In order to reuse most of the code across Mach and Windows v1 RunLoopSources, we define a // simple abstraction layer spanning Mach ports and Windows HANDLES -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE uint32_t __CFGetProcessPortCount(void) { ipc_info_space_t info; @@ -1960,7 +1960,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( void *info) __attribute__((noinline)); static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC void *(*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info), mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply, #else @@ -1968,7 +1968,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( #endif void *info) { if (perform) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC *reply = perform(msg, size, kCFAllocatorSystemDefault, info); #else perform(info); @@ -2053,7 +2053,7 @@ CF_INLINE void __CFRunLoopDebugInfoForRunLoopSource(CFRunLoopSourceRef rls) { } // msg, size and reply are unused on Windows -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) __attribute__((noinline)); static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopSourceRef rls, mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply) @@ -2079,7 +2079,7 @@ static Boolean __CFRunLoopDoSource1(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRun void *info = rls->_context.version1.info; cf_trace(KDEBUG_EVENT_CFRL_IS_CALLING_SOURCE1 | DBG_FUNC_START, rl, rlm, perform, info); __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__(perform, -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC msg, size, reply, #endif info); @@ -2450,7 +2450,7 @@ CF_EXPORT Boolean _CFRunLoopFinished(CFRunLoopRef rl, CFStringRef modeName) { static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInterval seconds, Boolean stopAfterHandle, CFRunLoopModeRef previousMode) __attribute__((noinline)); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define TIMEOUT_INFINITY (~(mach_msg_timeout_t)0) @@ -2742,12 +2742,12 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter Boolean didDispatchPortLastTime = true; int32_t retVal = 0; do { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC voucher_mach_msg_state_t voucherState = VOUCHER_MACH_MSG_STATE_UNCHANGED; voucher_t voucherCopy = NULL; #endif uint8_t msg_buffer[3 * 1024]; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC mach_msg_header_t *msg = NULL; mach_port_t livePort = MACH_PORT_NULL; #elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN @@ -2779,7 +2779,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #if __HAS_DISPATCH__ if (MACH_PORT_NULL != dispatchPort && !didDispatchPortLastTime) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC msg = (mach_msg_header_t *)msg_buffer; if (__CFRunLoopServiceMachPort(dispatchPort, &msg, sizeof(msg_buffer), &livePort, 0, &voucherState, NULL, rl, rlm)) { goto handle_msg; @@ -2814,7 +2814,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter CFAbsoluteTime sleepStart = poll ? 0.0 : CFAbsoluteTimeGetCurrent(); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #if USE_DISPATCH_SOURCE_FOR_TIMERS do { msg = (mach_msg_header_t *)msg_buffer; @@ -2974,7 +2974,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter // Despite the name, this works for windows handles as well CFRunLoopSourceRef rls = __CFRunLoopModeFindSourceForMachPort(rl, rlm, livePort); if (rls) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC mach_msg_header_t *reply = NULL; sourceHandledThisLoop = __CFRunLoopDoSource1(rl, rlm, rls, msg, msg->msgh_size, &reply) || sourceHandledThisLoop; if (NULL != reply) { @@ -2992,7 +2992,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter /* --- BLOCKS --- */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (msg && msg != (mach_msg_header_t *)msg_buffer) free(msg); #endif @@ -3114,7 +3114,7 @@ void CFRunLoopWakeUp(CFRunLoopRef rl) { __CFRunLoopUnlock(rl); return; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC kern_return_t ret; /* We unconditionally try to send the message, since we don't want * to lose a wakeup, but the send may fail if there is already a @@ -3717,7 +3717,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL void *addr = rls->_context.version0.version == 0 ? (void *)rls->_context.version0.perform : (rls->_context.version0.version == 1 ? (void *)rls->_context.version1.perform : NULL); #if DEPLOYMENT_TARGET_WINDOWS contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %p}"), rls->_context.version0.version, rls->_context.version0.info, addr); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_MAC || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %s (%p)}"), rls->_context.version0.version, rls->_context.version0.info, name, addr); @@ -3916,7 +3916,7 @@ static CFStringRef __CFRunLoopObserverCopyDescription(CFTypeRef cf) { /* DOES CA } #if DEPLOYMENT_TARGET_WINDOWS result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{valid = %s, activities = 0x%x, repeats = %s, order = %d, callout = %p, context = %@}"), cf, CFGetAllocator(rlo), __CFIsValid(rlo) ? "Yes" : "No", rlo->_activities, __CFRunLoopObserverRepeats(rlo) ? "Yes" : "No", rlo->_order, rlo->_callout, contextDesc); -#elif TARGET_OS_OSX || TARGET_OS_IPHONE || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_MAC || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) void *addr = rlo->_callout; Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; @@ -4370,7 +4370,7 @@ void CFRunLoopTimerGetContext(CFRunLoopTimerRef rlt, CFRunLoopTimerContext *cont } CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), CFTimeInterval, (NSTimer *)rlt, tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); @@ -4381,7 +4381,7 @@ CFTimeInterval CFRunLoopTimerGetTolerance(CFRunLoopTimerRef rlt) { } void CFRunLoopTimerSetTolerance(CFRunLoopTimerRef rlt, CFTimeInterval tolerance) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CHECK_FOR_FORK(); CF_OBJC_FUNCDISPATCHV(CFRunLoopTimerGetTypeID(), void, (NSTimer *)rlt, setTolerance:tolerance); __CFGenericValidateType(rlt, CFRunLoopTimerGetTypeID()); diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 9ccc078171..41cac4a837 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -937,7 +937,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #include #include @@ -1029,7 +1029,7 @@ static void timeradd(struct timeval *a, struct timeval *b, struct timeval *res) static _CFThreadRef __cfSocketTid() { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC uint64_t tid = 0; if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); @@ -1117,7 +1117,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_UNIX +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_UNIX #define INVALID_SOCKET (CFSocketNativeHandle)(-1) #define closesocket(a) close((a)) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) @@ -1349,7 +1349,7 @@ CF_INLINE Boolean __CFSocketFdClr(CFSocketNativeHandle sock, CFMutableDataRef fd } static SInt32 __CFSocketCreateWakeupSocketPair(void) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC SInt32 error; error = socketpair(PF_LOCAL, SOCK_DGRAM, 0, __CFWakeupSocketPair); @@ -2447,7 +2447,7 @@ static CFStringRef __CFSocketCopyDescription(CFTypeRef cf) { result = CFStringCreateMutable(CFGetAllocator(s), 0); __CFSocketLock(s); void *addr = s->_callout; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC Dl_info info; const char *name = (dladdr(addr, &info) && info.dli_saddr == addr && info.dli_sname) ? info.dli_sname : "???"; #else @@ -2508,7 +2508,7 @@ const CFRuntimeClass __CFSocketClass = { CFTypeID CFSocketGetTypeID(void) { static dispatch_once_t initOnce; dispatch_once(&initOnce, ^{ -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC struct rlimit lim1; int ret1 = getrlimit(RLIMIT_NOFILE, &lim1); int mib[] = {CTL_KERN, KERN_MAXFILESPERPROC}; @@ -2615,13 +2615,13 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN if (INVALID_SOCKET != sock) CFDictionaryAddValue(__CFAllSockets, (void *)(uintptr_t)sock, memory); if (NULL == __CFSocketManagerThread) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD _CFThreadRef tid = 0; pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif pthread_create(&tid, &attr, __CFSocketManager, 0); @@ -3269,7 +3269,7 @@ CFSocketError CFSocketSetAddress(CFSocketRef s, CFDataRef address) { if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // Verify that the namelen is correct. If not, we have to fix it up. Developers will often incorrectly use 0 or strlen(path). See 9217961 and the second half of 9098274. // Max size is a size byte, plus family byte, plus path of 255, plus a null byte. char newName[255]; @@ -3321,7 +3321,7 @@ CFSocketError CFSocketConnectToAddress(CFSocketRef s, CFDataRef address, CFTimeI if (!name || namelen <= 0) return kCFSocketError; CFSocketNativeHandle sock = CFSocketGetNative(s); { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC SInt32 flags = fcntl(sock, F_GETFL, 0); if (flags >= 0) wasBlocking = ((flags & O_NONBLOCK) == 0); if (wasBlocking && (timeout > 0.0 || timeout < 0.0)) ioctlsocket(sock, FIONBIO, (u_long *)&yes); @@ -3383,7 +3383,7 @@ CFSocketRef CFSocketCreate(CFAllocatorRef allocator, SInt32 protocolFamily, SInt if (0 >= protocol && SOCK_STREAM == socketType) protocol = IPPROTO_TCP; if (0 >= protocol && SOCK_DGRAM == socketType) protocol = IPPROTO_UDP; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (PF_LOCAL == protocolFamily && 0 >= socketType) socketType = SOCK_STREAM; #endif #if DEPLOYMENT_TARGET_WINDOWS @@ -3470,7 +3470,7 @@ static void __CFSocketSendNameRegistryRequest(CFSocketSignature *signature, CFDi static void __CFSocketValidateSignature(const CFSocketSignature *providedSignature, CFSocketSignature *signature, uint16_t defaultPortNumber) { struct sockaddr_in sain, *sainp; memset(&sain, 0, sizeof(sain)); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; @@ -3496,7 +3496,7 @@ static void __CFSocketValidateSignature(const CFSocketSignature *providedSignatu } else { sainp = (struct sockaddr_in *)CFDataGetBytePtr(providedSignature->address); if ((int)sizeof(struct sockaddr_in) <= CFDataGetLength(providedSignature->address) && (AF_INET == sainp->sin_family || 0 == sainp->sin_family)) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC sain.sin_len = sizeof(sain); #endif sain.sin_family = AF_INET; diff --git a/CoreFoundation/Stream.subproj/CFConcreteStreams.c b/CoreFoundation/Stream.subproj/CFConcreteStreams.c index e9fe287848..2977cc0c82 100644 --- a/CoreFoundation/Stream.subproj/CFConcreteStreams.c +++ b/CoreFoundation/Stream.subproj/CFConcreteStreams.c @@ -18,7 +18,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX #include #include #endif @@ -49,7 +49,7 @@ typedef struct { CONST_STRING_DECL(kCFStreamPropertyFileCurrentOffset, "kCFStreamPropertyFileCurrentOffset"); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CONST_STRING_DECL(_kCFStreamPropertyFileNativeHandle, "_kCFStreamPropertyFileNativeHandle"); #endif CONST_STRING_DECL(_kCFStreamPropertyHTTPTrailer, "_kCFStreamPropertyHTTPTrailer"); @@ -442,7 +442,7 @@ static CFTypeRef fileCopyProperty(struct _CFStream *stream, CFStringRef property if (fileStream->offset != -1) { result = CFNumberCreate(CFGetAllocator((CFTypeRef)stream), kCFNumberSInt64Type, &(fileStream->offset)); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC } else if (CFEqual(propertyName, _kCFStreamPropertyFileNativeHandle)) { int fd = fileStream->fd; if (fd != -1) { diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index fb57939b60..87e44b7d3b 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -19,7 +19,7 @@ #include #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // On Mach these live in CF for historical reasons, even though they are declared in CFNetwork const int kCFStreamErrorDomainSSL = 3; @@ -109,7 +109,7 @@ static struct { #define CFNETWORK_CALL(sym, args) ((CFNetworkSupport.sym)args) -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define CFNETWORK_LOAD_SYM(sym) __CFLookupCFNetworkFunction(#sym) #elif DEPLOYMENT_TARGET_WINDOWS #define CFNETWORK_LOAD_SYM(sym) (void *)GetProcAddress(CFNetworkSupport.image, #sym) @@ -118,7 +118,7 @@ static struct { static void initializeCFNetworkSupport(void) { __CFBitSet(CFNetworkSupport.flags, kTriedToLoad); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CFNetworkSupport._CFSocketStreamCreatePair = CFNETWORK_LOAD_SYM(_CFSocketStreamCreatePair); CFNetworkSupport._CFErrorCreateWithStreamError = CFNETWORK_LOAD_SYM(_CFErrorCreateWithStreamError); CFNetworkSupport._CFStreamErrorFromCFError = CFNETWORK_LOAD_SYM(_CFStreamErrorFromCFError); diff --git a/CoreFoundation/Stream.subproj/CFStream.c b/CoreFoundation/Stream.subproj/CFStream.c index 383e3f343e..a5950d2a79 100644 --- a/CoreFoundation/Stream.subproj/CFStream.c +++ b/CoreFoundation/Stream.subproj/CFStream.c @@ -1742,7 +1742,7 @@ static CFRunLoopRef _legacyStreamRunLoop() pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC pthread_attr_set_qos_class_np(&attr, qos_class_main(), 0); #endif _CFThreadRef workThread; diff --git a/CoreFoundation/String.subproj/CFBurstTrie.c b/CoreFoundation/String.subproj/CFBurstTrie.c index 9ccc540dc0..184efae961 100644 --- a/CoreFoundation/String.subproj/CFBurstTrie.c +++ b/CoreFoundation/String.subproj/CFBurstTrie.c @@ -18,7 +18,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX #include #include #include diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index 8ee029145e..cbccf658b7 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -27,14 +27,14 @@ #include "CFString_Internal.h" #include "CFRuntime_Internal.h" #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include "CFLocaleInternal.h" #include "CFStringLocalizedFormattingInternal.h" #endif #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #include #endif @@ -103,7 +103,7 @@ static void __CFRecordStringAllocationEvent(const char *encoding, const char *by } #endif //INSTRUMENT_SHARED_STRINGS -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC extern size_t malloc_good_size(size_t size); #endif extern void __CFStrConvertBytesToUnicode(const uint8_t *bytes, UniChar *buffer, CFIndex numChars); @@ -414,7 +414,7 @@ static CFStringEncoding __CFDefaultFileSystemEncoding = kCFStringEncodingInvalid CFStringEncoding __CFDefaultEightBitStringEncoding = kCFStringEncodingInvalidId; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define __defaultEncoding kCFStringEncodingMacRoman #elif TARGET_OS_LINUX #define __defaultEncoding kCFStringEncodingUTF8 @@ -443,7 +443,7 @@ CF_INLINE CFStringEncoding __CFStringGetSystemEncoding(void) { CFStringEncoding CFStringFileSystemEncoding(void) { if (__CFDefaultFileSystemEncoding == kCFStringEncodingInvalidId) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS __CFDefaultFileSystemEncoding = kCFStringEncodingUTF8; #else __CFDefaultFileSystemEncoding = CFStringGetSystemEncoding(); @@ -645,7 +645,7 @@ CF_INLINE CFIndex __CFStrNewCapacity(CFMutableStringRef str, unsigned long reqCa } if (__CFStrHasContentsAllocator(str)) { /* Also apply any preferred size from the allocator */ newCapacity = CFAllocatorGetPreferredSizeForSize(__CFStrContentsAllocator(str), newCapacity, 0); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC } else { newCapacity = malloc_good_size(newCapacity); #endif @@ -4657,7 +4657,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (((encoding & 0x0FFF) == kCFStringEncodingUnicode) && ((encoding == kCFStringEncodingUnicode) || ((encoding > kCFStringEncodingUTF8) && (encoding <= kCFStringEncodingUTF32LE)))) { guessedByteLength = (length + 1) * ((((encoding >> 26) & 2) == 0) ? sizeof(UTF16Char) : sizeof(UTF32Char)); // UTF32 format has the bit set } else if (((guessedByteLength = CFStringGetMaximumSizeForEncoding(length, encoding)) > length) && !CF_IS_OBJC(_kCFRuntimeIDCFString, string) && !CF_IS_SWIFT(_kCFRuntimeIDCFString, string)) { // Multi byte encoding -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD if (__CFStrIsUnicode(string)) { CFIndex aLength = CFStringEncodingByteLengthForCharacters(encoding, kCFStringEncodingPrependBOM, __CFStrContents(string), __CFStrLength(string)); if (aLength > 0) guessedByteLength = aLength; @@ -4671,7 +4671,7 @@ CFDataRef CFStringCreateExternalRepresentation(CFAllocatorRef alloc, CFStringRef if (guessedByteLength == length && __CFStrIsEightBit(string) && __CFStringEncodingIsSupersetOfASCII(encoding)) { // It's all ASCII !! return CFDataCreate(alloc, ((uint8_t *)__CFStrContents(string) + __CFStrSkipAnyLengthByte(string)), __CFStrLength(string)); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD } #endif } @@ -6500,7 +6500,7 @@ reswtch:switch (ch) { // Length of the buffer to call sprintf() with #define BUFFER_LEN 512 -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define SNPRINTF(TYPE, WHAT) { \ TYPE value = (TYPE) WHAT; \ if (-1 != specs[curSpec].widthArgNum) { \ @@ -6740,7 +6740,7 @@ static CFIndex __CFStringValidateFormat(CFStringRef expected, CFStringRef untrus if (!verified) { if (errorPtr) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS CFStringRef debugMsg = CFStringCreateWithFormat(tmpAlloc, NULL, CFSTR("Format '%@' does not match expected '%@'"), untrustedFormat, expected); CFMutableDictionaryRef userInfo = CFDictionaryCreateMutable(tmpAlloc, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(userInfo, kCFErrorDebugDescriptionKey, debugMsg); @@ -7186,7 +7186,7 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr } // See if we need to localize the decimal point if (formatOptions) { // We have localization info -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringRef decimalSeparator = (CFGetTypeID(formatOptions) == CFLocaleGetTypeID()) ? (CFStringRef)CFLocaleGetValue((CFLocaleRef)formatOptions, kCFLocaleDecimalSeparatorKey) : (CFStringRef)CFDictionaryGetValue(formatOptions, CFSTR("NSDecimalSeparator")); #else CFStringRef decimalSeparator = CFSTR("."); diff --git a/CoreFoundation/String.subproj/CFStringEncodings.c b/CoreFoundation/String.subproj/CFStringEncodings.c index 9d01ab21b3..bcece3eb9b 100644 --- a/CoreFoundation/String.subproj/CFStringEncodings.c +++ b/CoreFoundation/String.subproj/CFStringEncodings.c @@ -809,7 +809,7 @@ CFIndex CFStringGetMaximumSizeOfFileSystemRepresentation(CFStringRef string) { } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithErrorStatus(CFStringRef string, char *buffer, CFIndex maxBufLen, CFIndex *characterIndex) { #define MAX_STACK_BUFFER_LEN (255) const UTF16Char *characters = CFStringGetCharactersPtr(string); @@ -892,7 +892,7 @@ _CFStringFileSystemRepresentationError _CFStringGetFileSystemRepresentationWithE #endif Boolean CFStringGetFileSystemRepresentation(CFStringRef string, char *buffer, CFIndex maxBufLen) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC return _CFStringGetFileSystemRepresentationWithErrorStatus(string, buffer, maxBufLen, NULL) == _kCFStringFileSystemRepresentationErrorNone; #else return CFStringGetCString(string, buffer, maxBufLen, CFStringFileSystemEncoding()); diff --git a/CoreFoundation/String.subproj/CFStringUtilities.c b/CoreFoundation/String.subproj/CFStringUtilities.c index 172cf79e2f..af19e00bb6 100644 --- a/CoreFoundation/String.subproj/CFStringUtilities.c +++ b/CoreFoundation/String.subproj/CFStringUtilities.c @@ -17,7 +17,7 @@ #include "CFICUConverters.h" #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX #include #include #endif @@ -110,7 +110,7 @@ CFStringEncoding CFStringConvertIANACharSetNameToEncoding(CFStringRef charsetNam encoding = __CFStringEncodingGetFromCanonicalName(name); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingInvalidId == encoding) encoding = __CFStringEncodingGetFromICUName(name); #endif @@ -258,7 +258,7 @@ CFStringEncoding CFStringGetMostCompatibleMacStringEncoding(CFStringEncoding enc #define kCFStringCompareAllocationIncrement (128) -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX // ------------------------------------------------------------------------------------------------- // CompareSpecials - ignore case & diacritic differences @@ -420,7 +420,7 @@ static UCollator *__CFStringCopyDefaultCollator(CFLocaleRef compareLocale) { return collator; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static void __collatorFinalize(UCollator *collator) { CFLocaleRef locale = _CFGetTSD(__CFTSDKeyCollatorLocale); _CFSetTSD(__CFTSDKeyCollatorUCollator, NULL, NULL); @@ -526,7 +526,7 @@ static OSStatus __CompareTextDefault(UCollator *collator, CFOptionFlags options, return 0; // noErr } -#endif // TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#endif // TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static inline CFIndex __extendLocationBackward(CFIndex location, CFStringInlineBuffer *str, const uint8_t *nonBaseBMP, const uint8_t *punctBMP) { while (location > 0) { @@ -570,7 +570,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * CFRange range1 = str1Range; CFRange range2 = str2Range; SInt32 order; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX Boolean isEqual; bool forcedOrdering = ((options & kCFCompareForcedOrdering) ? true : false); @@ -604,8 +604,8 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range2.location = __extendLocationBackward(range2.location - 1, str2, nonBaseBMP, punctBMP); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC // First we try to use the last one used on this thread, if the locale is the same, // otherwise we try to check out a default one, or then we create one. UCollator *threadCollator = _CFGetTSD(__CFTSDKeyCollatorUCollator); @@ -620,7 +620,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * collator = __CFStringCreateCollator((CFLocaleRef)compareLocale); defaultCollator = false; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC } #endif #endif @@ -632,7 +632,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range1.length = (str1Range.location + str1Range.length) - range1.location; range2.length = (str2Range.location + str2Range.length) - range2.location; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { compResult = ((isEqual && !forcedOrdering) ? kCFCompareEqualTo : ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan)); } else @@ -702,7 +702,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { if (isEqual) { if (forcedOrdering && (kCFCompareEqualTo == compResult) && (0 != order)) compResult = ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan); @@ -739,7 +739,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * if (buffer2Len > 0) CFAllocatorDeallocate(kCFAllocatorSystemDefault, buffer2); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (collator == threadCollator) { // do nothing, already cached } else { diff --git a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c index 1d6cd280c3..12f78d3746 100644 --- a/CoreFoundation/StringEncodings.subproj/CFICUConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFICUConverters.c @@ -220,7 +220,7 @@ static CFIndex __CFStringEncodingConverterReleaseICUConverter(UConverter *conver #define MAX_BUFFER_SIZE (1000) -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #if 0 // we're no longer doing this check. Revive when the status in the bug changed. #if (U_ICU_VERSION_MAJOR_NUM > 49) diff --git a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c index a5ccf44a62..a09dd45ad4 100644 --- a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c @@ -27,7 +27,7 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX static const CFStringEncodingConverter __CFICUBootstrap = { .toBytes.standard = NULL, @@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert if (__CFIsPlatformConverterAvailable(encoding)) { return &__CFPlatformBootstrap; } else { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (__CFStringEncodingGetICUName(encoding)) { return &__CFICUBootstrap; } @@ -74,7 +74,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CF_PRIVATE CFStringEncoding *__CFStringEncodingCreateListOfAvailablePlatformConverters(CFAllocatorRef allocator, CFIndex *numberOfConverters) { return NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index c212303d95..ce81250c1e 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper; break; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX case kCFStringEncodingConverterICU: converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding); break; @@ -599,7 +599,7 @@ static const _CFEncodingConverter *__CFGetConverter(uint32_t encoding) { case kCFStringEncodingUTF8: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[0]); break; /* the swith here should avoid possible bootstrap issues in the default: case below when invoked from CFStringGetSystemEncoding() */ -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX case kCFStringEncodingMacRoman: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[1]); break; #elif DEPLOYMENT_TARGET_WINDOWS case kCFStringEncodingWindowsLatin1: commonConverterSlot = (const _CFEncodingConverter **)(&(commonConverters[1])); break; @@ -696,7 +696,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen); #endif @@ -825,7 +825,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const if (!converter) return kCFStringEncodingConverterUnavailable; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen); #endif @@ -869,7 +869,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_ const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes); #endif @@ -913,7 +913,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars); #endif @@ -998,7 +998,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void if (NULL == encodings) { CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings; CFIndex numICUConverters = 0, numPlatformConverters = 0; -#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters); #else CFStringEncoding *icuConverters = NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index 909e8c80e5..3e2db59edd 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -15,7 +15,7 @@ #include "CFStringEncodingConverterExt.h" #include "CFUnicodeDecomposition.h" #include "CFUniCharPriv.h" -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #include #include #include @@ -24,7 +24,7 @@ #include #include #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #include #endif @@ -32,7 +32,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define __kCFCharacterSetDir "/System/Library/CoreServices" #elif TARGET_OS_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" @@ -40,7 +40,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #define USE_MACHO_SEGMENT 1 #elif DEPLOYMENT_RUNTIME_SWIFT && (TARGET_OS_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) #define USE_RAW_SYMBOL 1 @@ -56,7 +56,7 @@ enum { CF_INLINE uint32_t __CFUniCharMapExternalSetToInternalIndex(uint32_t cset) { return ((kCFUniCharFirstInternalSet <= cset) ? ((cset - kCFUniCharFirstInternalSet) + kCFUniCharLastExternalSet) : cset) - kCFUniCharFirstBitmapSet; } CF_INLINE uint32_t __CFUniCharMapCompatibilitySetID(uint32_t cset) { return ((cset == kCFUniCharControlCharacterSet) ? kCFUniCharControlAndFormatterCharacterSet : (((cset > kCFUniCharLastExternalSet) && (cset < kCFUniCharFirstInternalSet)) ? ((cset - kCFUniCharLastExternalSet) + kCFUniCharFirstInternalSet) : cset)); } -#if (TARGET_OS_OSX || TARGET_OS_IPHONE) && USE_MACHO_SEGMENT +#if TARGET_OS_MAC && USE_MACHO_SEGMENT #include #include #include @@ -107,14 +107,14 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, // Memory map the file -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif TARGET_OS_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); @@ -171,7 +171,7 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { #elif DEPLOYMENT_TARGET_WINDOWS static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { @@ -238,7 +238,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #endif // USE_MACHO_SEGMENT -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #if !defined(CF_UNICHAR_BITMAP_FILE) #if USE_MACHO_SEGMENT #define CF_UNICHAR_BITMAP_FILE "__csbitmaps" @@ -254,7 +254,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -286,7 +286,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -308,7 +308,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICODE_DATA_SYM __CFUnicodeDataL #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_MACHO_SEGMENT *bytes = __CFGetSectDataPtr("__UNICODE", bitmapName, NULL); diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index 70786f2963..0044664a90 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -20,7 +20,7 @@ #include #include #include -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX #if TARGET_OS_OSX #include #endif @@ -52,7 +52,7 @@ static CFStringRef POSIXPathToURLPath(CFStringRef path, CFAllocatorRef alloc, Bo static CFStringRef CreateStringFromFileSystemRepresentationByAddingPercentEscapes(CFAllocatorRef alloc, const UInt8 *bytes, CFIndex numBytes, Boolean isDirectory, Boolean isAbsolute, Boolean windowsPath, Boolean *addedPercentEncoding) CF_RETURNS_RETAINED; CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLRef anURL, CFURLPathStyle fsType, Boolean resolveAgainstBase) CF_RETURNS_RETAINED; CF_EXPORT CFURLRef _CFURLCreateCurrentDirectoryURL(CFAllocatorRef allocator) CF_RETURNS_RETAINED; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static Boolean _CFURLHasFileURLScheme(CFURLRef url, Boolean *hasScheme); #endif @@ -66,7 +66,7 @@ static CONST_STRING_DECL(kCFURLHTTPSScheme, "https") static CONST_STRING_DECL(kCFURLFileScheme, "file") static CONST_STRING_DECL(kCFURLDataScheme, "data") static CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC static CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #else @@ -75,7 +75,7 @@ CONST_STRING_DECL(kCFURLHTTPSScheme, "https") CONST_STRING_DECL(kCFURLFileScheme, "file") CONST_STRING_DECL(kCFURLDataScheme, "data") CONST_STRING_DECL(kCFURLFTPScheme, "ftp") -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CONST_STRING_DECL(kCFURLLocalhost, "localhost") #endif #endif @@ -2262,7 +2262,7 @@ static CFURLRef _CFURLCreateWithFileSystemRepresentation(CFAllocatorRef allocato #endif struct __CFURL *result = NULL; if (bufLen > 0) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX Boolean isAbsolute = bufLen && (*buffer == '/'); Boolean addedPercentEncoding; Boolean releaseBaseURL = false; @@ -2348,7 +2348,7 @@ CFURLRef _CFURLCopyFileURL(CFURLRef url) { struct __CFURL *result = NULL; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC // make sure we have a CFURL since this might be a subclassed NSURL url = _CFURLFromNSURL(url); __CFGenericValidateType(url, CFURLGetTypeID()); @@ -2841,7 +2841,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { uint8_t numberOfRanges; const CFRange *baseRanges; Boolean baseIsObjC; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC Boolean filePathURLCreated = false; #endif @@ -2858,7 +2858,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { if (!base) { return (CFURLRef)CFRetain(relativeURL); } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC else if ( CFURLIsFileReferenceURL(base) && !CFURLHasDirectoryPath(base) ) { // 16695827 - If the base URL is a file reference URL which doesn't end with a slash, we have to convert it to a file path URL before we can make it absolute. base = CFURLCreateFilePathURL(alloc, base, NULL); @@ -2895,7 +2895,7 @@ CFURLRef CFURLCopyAbsoluteURL(CFURLRef relativeURL) { #endif } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( filePathURLCreated ) { CFRelease(base); } @@ -4045,7 +4045,7 @@ static CFStringRef URLPathToPOSIXPath(CFStringRef path, CFAllocatorRef allocator return result; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str, UInt8 *inBuffer, CFIndex inBufferLen) { size_t fileURLPrefixLength; @@ -4371,7 +4371,7 @@ CF_EXPORT CFStringRef CFURLCopyFileSystemPath(CFURLRef anURL, CFURLPathStyle pat CFStringRef result = NULL; CFAllocatorRef alloc = CFGetAllocator(anURL); -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX Boolean isCanonicalFileURL = false; if ( (pathStyle == kCFURLPOSIXPathStyle) && (CFURLGetBaseURL(anURL) == NULL) ) { @@ -4515,13 +4515,13 @@ CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLR } Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, uint8_t *buffer, CFIndex bufLen) { -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS CFAllocatorRef alloc = CFGetAllocator(url); CFStringRef path; if (!url) return false; #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_LINUX if ( !resolveAgainstBase || (CFURLGetBaseURL(url) == NULL) ) { if (!CF_IS_OBJC(CFURLGetTypeID(), url)) { // We can access the ivars @@ -4655,7 +4655,7 @@ CFStringRef CFURLCopyLastPathComponent(CFURLRef url) { } } else { Boolean filePathURLCreated = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(CFGetAllocator(url), url, NULL); @@ -4784,7 +4784,7 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe CFAssert1(pathComponent != NULL, __kCFLogAssertion, "%s(): Cannot be called with a NULL component to append", __PRETTY_FUNCTION__); Boolean filePathURLCreated = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL if possible (only because this is appending a path component) CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4848,7 +4848,7 @@ CFURLRef CFURLCreateCopyDeletingLastPathComponent(CFAllocatorRef allocator, CFUR __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4930,7 +4930,7 @@ CFURLRef CFURLCreateCopyAppendingPathExtension(CFAllocatorRef allocator, CFURLRe __CFGenericValidateType(extension, CFStringGetTypeID()); Boolean filePathURLCreated = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -4991,7 +4991,7 @@ CFURLRef CFURLCreateCopyDeletingPathExtension(CFAllocatorRef allocator, CFURLRef __CFGenericValidateType(url, CFURLGetTypeID()); Boolean filePathURLCreated = false; -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if ( CFURLIsFileReferenceURL(url) ) { // use a file path URL or fail CFURLRef filePathURL = CFURLCreateFilePathURL(allocator, url, NULL); @@ -5134,7 +5134,7 @@ CFURLRef _CFURLCreateFromPropertyListRepresentation(CFAllocatorRef alloc, CFProp return url; } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC Boolean _CFURLIsFileReferenceURL(CFURLRef url) { return ( CFURLIsFileReferenceURL(url) ); @@ -5160,7 +5160,7 @@ Boolean CFURLIsFileReferenceURL(CFURLRef url) } #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC CFURLRef CFURLCreateFilePathURL(CFAllocatorRef alloc, CFURLRef url, CFErrorRef *error) { diff --git a/CoreFoundation/URL.subproj/CFURL.inc.h b/CoreFoundation/URL.subproj/CFURL.inc.h index af8eef4785..bfd3103e9c 100644 --- a/CoreFoundation/URL.subproj/CFURL.inc.h +++ b/CoreFoundation/URL.subproj/CFURL.inc.h @@ -244,7 +244,7 @@ break; } } -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC if (pathRg.length > 6 && characterArray[pathRg.location] == '/' && characterArray[pathRg.location + 1] == '.' && characterArray[pathRg.location + 2] == 'f' && characterArray[pathRg.location + 3] == 'i' && characterArray[pathRg.location + 4] == 'l' && characterArray[pathRg.location + 5] == 'e' && characterArray[pathRg.location + 6] == '/') { flags |= PATH_HAS_FILE_ID; } else if (!sawPercent) { diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index 49ff8f4c91..fd329499e5 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -45,7 +45,7 @@ CFData read/write routines #include #endif -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC DEFINE_WEAK_CFNETWORK_FUNC_FAIL(Boolean, _CFURLCreateDataAndPropertiesFromResource, (CFAllocatorRef A, CFURLRef B, CFDataRef *C, CFDictionaryRef *D, CFArrayRef E, SInt32 *F), (A, B, C, D, E, F), { if(C) *C=NULL; if (D) *D=NULL; if(F) *F=kCFURLImproperArgumentsError; }, false) @@ -712,7 +712,7 @@ Boolean CFURLCreateDataAndPropertiesFromResource(CFAllocatorRef alloc, CFURLRef } else if (CFStringCompare(scheme, CFSTR("data"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { result = _CFDataURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode); } else { -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC result = __CFNetwork__CFURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, fetchedProperties, desiredProperties, errorCode); #else if (fetchedData) *fetchedData = NULL; @@ -779,7 +779,7 @@ Boolean CFURLWriteDataAndPropertiesToResource(CFURLRef url, CFDataRef data, CFDi return success; } else { CFRelease(scheme); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC Boolean result = __CFNetwork__CFURLWriteDataAndPropertiesToResource(url, data, propertyDict, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; @@ -825,7 +825,7 @@ Boolean CFURLDestroyResource(CFURLRef url, SInt32 *errorCode) { } } else { CFRelease(scheme); -#if TARGET_OS_OSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC Boolean result = __CFNetwork__CFURLDestroyResource(url, errorCode); if (!result) { if (errorCode) *errorCode = kCFURLUnknownSchemeError; From eb4a328567cd452d53fea1f1f2c66fe40981ea48 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 12:43:37 -0700 Subject: [PATCH 08/10] DEPLOYMENT_TARGET_WINDOWS -> TARGET_OS_WIN32 --- CMakeLists.txt | 1 - CoreFoundation/Base.subproj/CFFileUtilities.c | 16 ++-- CoreFoundation/Base.subproj/CFInternal.h | 22 ++--- .../Base.subproj/CFKnownLocations.c | 4 +- CoreFoundation/Base.subproj/CFPlatform.c | 48 +++++------ CoreFoundation/Base.subproj/CFRuntime.c | 28 +++---- CoreFoundation/Base.subproj/CFUUID.c | 4 +- CoreFoundation/Base.subproj/CFUtilities.c | 20 ++--- .../Base.subproj/CFWindowsUtilities.c | 2 +- .../Base.subproj/CoreFoundation_Prefix.h | 12 +-- .../Base.subproj/ForFoundationOnly.h | 6 +- .../Base.subproj/ForSwiftFoundationOnly.h | 6 +- CoreFoundation/CMakeLists.txt | 3 - CoreFoundation/Collections.subproj/CFData.c | 2 +- CoreFoundation/Error.subproj/CFError.c | 6 +- CoreFoundation/Locale.subproj/CFCalendar.c | 2 +- .../Locale.subproj/CFDateFormatter.c | 4 +- CoreFoundation/Locale.subproj/CFLocale.c | 80 +++++++++---------- .../Locale.subproj/CFLocaleIdentifier.c | 18 ++--- CoreFoundation/Locale.subproj/CFLocaleKeys.c | 2 +- CoreFoundation/NumberDate.subproj/CFDate.c | 16 ++-- CoreFoundation/NumberDate.subproj/CFNumber.c | 4 +- .../Parsing.subproj/CFPropertyList.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle.c | 10 +-- .../PlugIn.subproj/CFBundle_BinaryTypes.h | 2 +- .../PlugIn.subproj/CFBundle_Executable.c | 24 +++--- CoreFoundation/PlugIn.subproj/CFBundle_Grok.c | 4 +- .../PlugIn.subproj/CFBundle_Resources.c | 12 +-- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 50 ++++++------ CoreFoundation/RunLoop.subproj/CFSocket.c | 28 +++---- .../Stream.subproj/CFConcreteStreams.c | 2 +- .../Stream.subproj/CFSocketStream.c | 10 +-- CoreFoundation/Stream.subproj/CFStream.c | 8 +- CoreFoundation/String.subproj/CFBurstTrie.c | 14 ++-- CoreFoundation/String.subproj/CFString.c | 12 +-- .../String.subproj/CFStringUtilities.c | 18 ++--- .../CFPlatformConverters.c | 16 ++-- .../CFStringEncodingConverter.c | 14 ++-- .../StringEncodings.subproj/CFUniChar.c | 24 +++--- CoreFoundation/URL.subproj/CFURL.c | 14 ++-- CoreFoundation/URL.subproj/CFURL.inc.h | 2 +- CoreFoundation/URL.subproj/CFURLAccess.c | 4 +- 42 files changed, 286 insertions(+), 290 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cecfdc9f9d..13b8b2f8f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN") set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR}) elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) - set(deployment_target -DDEPLOYMENT_TARGET_WINDOWS) # FIXME(SR9138) Silence "locally defined symbol '…' imported in function '…' set(WORKAROUND_SR9138 -Xlinker;-ignore:4049;-Xlinker;-ignore:4217) set(WORKAROUND_SR9995 -Xlinker;-nodefaultlib:libcmt) diff --git a/CoreFoundation/Base.subproj/CFFileUtilities.c b/CoreFoundation/Base.subproj/CFFileUtilities.c index d2d05423f1..e1567c305b 100644 --- a/CoreFoundation/Base.subproj/CFFileUtilities.c +++ b/CoreFoundation/Base.subproj/CFFileUtilities.c @@ -17,7 +17,7 @@ #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #include @@ -46,7 +46,7 @@ #endif CF_INLINE int openAutoFSNoWait() { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 return -1; #else return (__CFProphylacticAutofsAccess ? open("/dev/autofs_nowait", 0) : -1); @@ -191,7 +191,7 @@ CF_PRIVATE Boolean _CFWriteBytesToFile(CFURLRef url, const void *bytes, CFIndex thread_set_errno(saveerr); return false; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 FlushFileBuffers((HANDLE)_get_osfhandle(fd)); #else fsync(fd); @@ -213,7 +213,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc, CFStringRef extension = (matchingAbstractType ? _CFCopyExtensionForAbstractType(matchingAbstractType) : NULL); CFIndex targetExtLen = (extension ? CFStringGetLength(extension) : 0); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // This is a replacement for 'dirent' below, and also uses wchar_t to support unicode paths wchar_t extBuff[CFMaxPathSize]; int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :( @@ -545,7 +545,7 @@ CF_PRIVATE SInt32 _CFGetPathProperties(CFAllocatorRef alloc, char *path, Boolean if (modTime != NULL) { if (fileExists) { -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX struct timespec ts = {statBuf.st_mtime, 0}; #else struct timespec ts = statBuf.st_mtimespec; @@ -599,7 +599,7 @@ CF_PRIVATE bool _CFURLExists(CFURLRef url) { return url && (0 == _CFGetFileProperties(kCFAllocatorSystemDefault, url, &exists, NULL, NULL, NULL, NULL, NULL)) && exists; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define WINDOWS_PATH_SEMANTICS #else #define UNIX_PATH_SEMANTICS @@ -1011,7 +1011,7 @@ CF_PRIVATE CFIndex _CFLengthAfterDeletingPathExtension(UniChar *unichars, CFInde return ((0 < start) ? start : length); } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define DT_DIR 4 #define DT_REG 8 #define DT_LNK 10 @@ -1023,7 +1023,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla char directoryPathBuf[CFMaxPathSize]; if (!CFStringGetFileSystemRepresentation(directoryPath, directoryPathBuf, CFMaxPathSize)) return; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Make sure there is room for the additional space we need in the win32 api if (strlen(directoryPathBuf) > CFMaxPathSize - 2) return; diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index ba3aabfc6f..c395bb590e 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -184,7 +184,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount(void); #endif #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define __builtin_unreachable() do { } while (0) #endif @@ -400,14 +400,14 @@ extern const char *__CFgetenvIfNotRestricted(const char *n); // Returns NULL CF_PRIVATE Boolean __CFProcessIsRestricted(void); // This is really about the availability of C99. We don't have that on Windows, but we should everywhere else. -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define STACK_BUFFER_DECL(T, N, C) T *N = (T *)_alloca((C) * sizeof(T)) #else #define STACK_BUFFER_DECL(T, N, C) T N[C] #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define SAFE_STACK_BUFFER_DECL(Type, Name, Count, Max) Type *Name; BOOL __ ## Name ## WasMallocd = NO; if (sizeof(Type) * Count > Max) { Name = (Type *)malloc((Count) * sizeof(Type)); __ ## Name ## WasMallocd = YES; } else Name = (Count > 0) ? _alloca((Count) * sizeof(Type)) : NULL #define SAFE_STACK_BUFFER_USE(Type, Name, Count, Max) if (sizeof(Type) * Count > Max) { Name = (Type *)malloc((Count) * sizeof(Type)); __ ## Name ## WasMallocd = YES; } else Name = (Count > 0) ? _alloca((Count) * sizeof(Type)) : NULL #define SAFE_STACK_BUFFER_CLEANUP(Name) if (__ ## Name ## WasMallocd) free(Name) @@ -421,7 +421,7 @@ CF_PRIVATE Boolean __CFProcessIsRestricted(void); // Be sure to call this before your SAFE_STACK_BUFFER exits scope. #define SAFE_STACK_BUFFER_CLEANUP(Name) if (__ ## Name ## WasMallocd) free(Name) -#endif // !DEPLOYMENT_TARGET_WINDOWS +#endif // !TARGET_OS_WIN32 CF_EXPORT void * __CFConstantStringClassReferencePtr; @@ -766,7 +766,7 @@ CF_EXPORT CFIndex _CFLengthAfterDeletingPathExtension(UniChar *unichars, CFIndex CF_PRIVATE CFArrayRef _CFCreateCFArrayByTokenizingString(const char *values, char delimiter); #if __BLOCKS__ -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define DT_DIR 4 #define DT_REG 8 #define DT_LNK 10 @@ -806,7 +806,7 @@ extern void _CFRuntimeSetInstanceTypeIDAndIsa(CFTypeRef cf, CFTypeID newTypeID); #define __has_attribute(...) 0 #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define _CF_VISIBILITY_HIDDEN_ATTRIBUTE #elif __has_attribute(visibility) #define _CF_VISIBILITY_HIDDEN_ATTRIBUTE __attribute__((visibility("hidden"))) @@ -943,13 +943,13 @@ CF_PRIVATE bool __CFBinaryPlistIsArray(const uint8_t *databytes, uint64_t datale #endif // Need to use the _O_BINARY flag on Windows to get the correct behavior -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define CF_OPENFLGS (_O_BINARY|_O_NOINHERIT) #else #define CF_OPENFLGS (0) #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // These are replacements for pthread calls on Windows CF_EXPORT int _NS_pthread_main_np(); @@ -975,12 +975,12 @@ CF_EXPORT bool _NS_pthread_equal(_CFThreadRef t1, _CFThreadRef t2); #define pthread_main_np _CFIsMainThread #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_PRIVATE const wchar_t *_CFDLLPath(void); #endif /* Buffer size for file pathname */ -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 /// Use this constant for the size (in characters) of a buffer in which to hold a path. This size adds space for at least a couple of null terminators at the end of a buffer into which you copy up to kCFMaxPathLength characters. #define CFMaxPathSize ((CFIndex)262) /// Use this constant for the maximum length (in characters) of a path you want to copy into a buffer. This should be the maximum number of characters before the null terminator(s). @@ -1026,7 +1026,7 @@ enum { }; #endif -#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || TARGET_OS_WIN32 #define QOS_CLASS_USER_INITIATED DISPATCH_QUEUE_PRIORITY_HIGH #define QOS_CLASS_DEFAULT DISPATCH_QUEUE_PRIORITY_DEFAULT #define QOS_CLASS_UTILITY DISPATCH_QUEUE_PRIORITY_LOW diff --git a/CoreFoundation/Base.subproj/CFKnownLocations.c b/CoreFoundation/Base.subproj/CFKnownLocations.c index f05485a130..81ad22ad97 100644 --- a/CoreFoundation/Base.subproj/CFKnownLocations.c +++ b/CoreFoundation/Base.subproj/CFKnownLocations.c @@ -45,7 +45,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUs } } -#elif !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#elif !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID /* Building for an OS that uses the FHS, BSD's hier(7), and/or the XDG specification for paths: @@ -72,7 +72,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUs } } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 switch (user) { case _kCFKnownLocationUserAny: diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index 120f28cc81..776584dc85 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -22,7 +22,7 @@ #include #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #include #include @@ -35,7 +35,7 @@ #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 #define kCFPlatformInterfaceStringEncoding kCFStringEncodingUTF8 #else #define kCFPlatformInterfaceStringEncoding CFStringGetSystemEncoding() @@ -54,7 +54,7 @@ CF_PRIVATE Boolean _CFGetCurrentDirectory(char *path, int maxlen) { return getcwd(path, maxlen) != NULL; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Returns the path to the CF DLL, which we can then use to find resources like char sets bool bDllPathCached = false; CF_PRIVATE const wchar_t *_CFDLLPath(void) { @@ -104,7 +104,7 @@ const char **_CFGetProcessPath(void) { return &__CFProcessPath; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 const char *_CFProcessPath(void) { if (__CFProcessPath) return __CFProcessPath; wchar_t buf[CFMaxPathSize] = {0}; @@ -126,7 +126,7 @@ const char *_CFProcessPath(void) { } #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) { return pthread_main_np() == 1; } @@ -274,7 +274,7 @@ CF_EXPORT CFStringRef CFCopyUserName(void) { result = CFStringCreateWithCString(kCFAllocatorSystemDefault, cuser, kCFPlatformInterfaceStringEncoding); } } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 wchar_t username[1040]; DWORD size = 1040; username[0] = 0; @@ -334,7 +334,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) { CFURLRef CFCopyHomeDirectoryURL(void) { #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD return _CFCopyHomeDirURLForUser(NULL, true); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 CFURLRef retVal = NULL; CFIndex len = 0; CFStringRef str = NULL; @@ -436,7 +436,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { } return result; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 // This code can only get the directory for the current user CFStringRef userName = uName ? CFCopyUserName() : NULL; if (uName && !CFEqual(uName, userName)) { @@ -455,7 +455,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) { #undef CFMaxHostNameLength #undef CFMaxHostNameSize -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_INLINE CFIndex strlen_UniChar(const UniChar* p) { CFIndex result = 0; while ((*p++) != 0) @@ -529,7 +529,7 @@ CF_EXPORT CFMutableStringRef _CFCreateApplicationRepositoryPath(CFAllocatorRef a #pragma mark - #pragma mark Thread Functions -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_EXPORT void _NS_pthread_setname_np(const char *name) { _CFThreadSetName(GetCurrentThread(), name); @@ -574,7 +574,7 @@ typedef struct __CFTSDTable { static void __CFTSDFinalize(void *arg); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 static DWORD __CFTSDIndexKey = 0xFFFFFFFF; @@ -616,7 +616,7 @@ static void __CFTSDSetSpecific(void *arg) { pthread_setspecific(__CFTSDIndexKey, arg); #elif TARGET_OS_LINUX pthread_setspecific(__CFTSDIndexKey, arg); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 FlsSetValue(__CFTSDIndexKey, arg); #endif } @@ -626,7 +626,7 @@ static void *__CFTSDGetSpecific() { return pthread_getspecific(__CFTSDIndexKey); #elif TARGET_OS_LINUX return pthread_getspecific(__CFTSDIndexKey); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 return FlsGetValue(__CFTSDIndexKey); #endif } @@ -690,7 +690,7 @@ static __CFTSDTable *__CFTSDGetTable(const Boolean create) { // This memory is freed in the finalize function table = (__CFTSDTable *)calloc(1, sizeof(__CFTSDTable)); // Windows and Linux have created the table already, we need to initialize it here for other platforms. On Windows, the cleanup function is called by DllMain when a thread exits. On Linux the destructor is set at init time. -#if !DEPLOYMENT_TARGET_WINDOWS +#if !TARGET_OS_WIN32 __CFTSDInitialize(); #endif __CFTSDSetSpecific(table); @@ -750,7 +750,7 @@ CF_EXPORT void *_CFSetTSD(uint32_t slot, void *newVal, tsdDestructor destructor) #pragma mark - #pragma mark Windows Wide to UTF8 and UTF8 to Wide -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 /* On Windows, we want to use UTF-16LE for path names to get full unicode support. Internally, however, everything remains in UTF-8 representation. These helper functions stand between CF and the Microsoft CRT to ensure that we are using the right representation on both sides. */ #include @@ -1177,7 +1177,7 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) { return 0; } -#endif // DEPLOYMENT_TARGET_WINDOWS +#endif // TARGET_OS_WIN32 #pragma mark - #pragma mark Linux OSAtomic @@ -1348,7 +1348,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) { #pragma mark - #pragma mark Windows and Linux Helpers -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX #include @@ -1389,7 +1389,7 @@ static void _CFThreadSpecificDestructor(void *ctx) { _CFThreadSpecificKey _CFThreadSpecificKeyCreate() { _CFThreadSpecificKey key; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 key = FlsAlloc(_CFThreadSpecificDestructor); #else pthread_key_create(&key, &_CFThreadSpecificDestructor); @@ -1398,7 +1398,7 @@ _CFThreadSpecificKey _CFThreadSpecificKeyCreate() { } CFTypeRef _Nullable _CFThreadSpecificGet(_CFThreadSpecificKey key) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 return (CFTypeRef)FlsGetValue(key); #else return (CFTypeRef)pthread_getspecific(key); @@ -1406,7 +1406,7 @@ CFTypeRef _Nullable _CFThreadSpecificGet(_CFThreadSpecificKey key) { } void _CFThreadSpecificSet(_CFThreadSpecificKey key, CFTypeRef _Nullable value) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (value != NULL) { swift_retain((void *)value); } @@ -1422,7 +1422,7 @@ void _CFThreadSpecificSet(_CFThreadSpecificKey key, CFTypeRef _Nullable value) { } _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (* _Nonnull startfn)(void *_Nullable), void *_CF_RESTRICT _Nullable context) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 DWORD dwCreationFlags = 0; DWORD dwStackSize = 0; if (attrs.dwSizeOfAttributes >= @@ -1444,7 +1444,7 @@ _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (* #endif } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // This code from here: // http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx @@ -1468,7 +1468,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_ return pthread_setname_np(name); } return EINVAL; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 THREADNAME_INFO info; info.dwType = 0x1000; @@ -1500,7 +1500,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) { CF_EXPORT char **_CFEnviron(void) { #if TARGET_OS_MAC return *_NSGetEnviron(); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 return _environ; #else return environ; diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c index 2777d8beb8..6aabc97d65 100644 --- a/CoreFoundation/Base.subproj/CFRuntime.c +++ b/CoreFoundation/Base.subproj/CFRuntime.c @@ -39,7 +39,7 @@ OBJC_EXPORT void *objc_destructInstance(id obj); #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #endif @@ -50,7 +50,7 @@ __kCFRetainEvent = 28, __kCFReleaseEvent = 29 }; -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX #include #elif TARGET_OS_BSD #include // malloc() @@ -418,7 +418,7 @@ CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const ch #endif strerror_r(errno, errorStringBuffer, errorStringBufferLength); CFLog(kCFLogLevelWarning, CFSTR("*** _CFRuntimeCreateInstance() tried to allocate an instance of '%s', which requires %zu-byte alignment, but memory could not be so allocated: %s"), className, align, errorStringPointer); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 CFLog(kCFLogLevelWarning, CFSTR("*** _CFRuntimeCreateInstance() tried to allocate an instance of '%s', which requires %zu-byte alignment, but aligned memory is not supported on this platform"), className, align); memory = (CFRuntimeBase *)malloc(size); #else @@ -965,7 +965,7 @@ extern CFTypeID CFStorageGetTypeID(void); #if TARGET_OS_LINUX || (TARGET_OS_MAC && !DEPLOYMENT_RUNTIME_OBJC) CF_PRIVATE void __CFTSDInitialize(void); #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // From CFPlatform.c CF_PRIVATE void __CFTSDWindowsCleanup(void); CF_PRIVATE void __CFFinalizeWindowsThreadData(); @@ -1072,7 +1072,7 @@ CF_PRIVATE Boolean __CFProcessIsRestricted() { return issetugid(); } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define kNilPthreadT INVALID_HANDLE_VALUE #else #define kNilPthreadT (_CFThreadRef)0 @@ -1094,7 +1094,7 @@ Boolean __CFInitialized = 0; // move the next 2 lines down into the #if below, and make it static, after Foundation gets off this symbol on other platforms. CF_EXPORT _CFThreadRef _CFMainPThread; _CFThreadRef _CFMainPThread = kNilPthreadT; -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX CF_EXPORT _CFThreadRef _CF_pthread_main_thread_np(void); _CFThreadRef _CF_pthread_main_thread_np(void) { @@ -1110,14 +1110,14 @@ _CFThreadRef _CF_pthread_main_thread_np(void) { static void __CFInitialize(void) __attribute__ ((constructor)); static #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_EXPORT #endif void __CFInitialize(void) { if (!__CFInitialized && !__CFInitializing) { __CFInitializing = 1; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (!pthread_main_np()) HALT; // CoreFoundation must be initialized on the main thread DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), @@ -1128,7 +1128,7 @@ void __CFInitialize(void) { _CFMainPThread = pthread_self(); #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Must not call any CF functions __CFTSDWindowsInitialize(); #elif TARGET_OS_LINUX || (TARGET_OS_MAC && !DEPLOYMENT_RUNTIME_OBJC) @@ -1208,7 +1208,7 @@ void __CFInitialize(void) { #if TARGET_OS_MAC args = *_NSGetArgv(); cnt = *_NSGetArgc(); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 wchar_t *commandLine = GetCommandLineW(); // result is actually pointer to wchar_t *, make sure to account for that below args = (char **)CommandLineToArgvW(commandLine, (int *)&cnt); @@ -1218,7 +1218,7 @@ void __CFInitialize(void) { list = (cnt <= 256) ? buffer : (CFStringRef *)malloc(cnt * sizeof(CFStringRef)); for (idx = 0, count = 0; idx < cnt; idx++) { if (NULL == args[idx]) continue; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 list[count] = CFStringCreateWithCharacters(kCFAllocatorSystemDefault, (const UniChar *)args[idx], wcslen((wchar_t *)args[idx])); #else list[count] = CFStringCreateWithCString(kCFAllocatorSystemDefault, args[idx], kCFStringEncodingUTF8); @@ -1236,7 +1236,7 @@ void __CFInitialize(void) { } __CFArgStuff = CFArrayCreate(kCFAllocatorSystemDefault, (const void **)list, count, &kCFTypeArrayCallBacks); if (list != buffer) free(list); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 LocalFree(args); #endif } @@ -1268,7 +1268,7 @@ void __CFInitialize(void) { } } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_PRIVATE void __CFStringCleanup(void); CF_PRIVATE void __CFSocketCleanup(void); @@ -1330,7 +1330,7 @@ int DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID pReserved ) { __CFStreamCleanup(); __CFSocketCleanup(); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // No CF functions should access TSD after this is called __CFTSDWindowsCleanup(); #endif diff --git a/CoreFoundation/Base.subproj/CFUUID.c b/CoreFoundation/Base.subproj/CFUUID.c index cff9f1e7cc..9eb63c503e 100644 --- a/CoreFoundation/Base.subproj/CFUUID.c +++ b/CoreFoundation/Base.subproj/CFUUID.c @@ -130,7 +130,7 @@ static CFUUIDRef __CFUUIDCreateWithBytesPrimitive(CFAllocatorRef allocator, CFUU return (CFUUIDRef)uuid; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #else #if DEPLOYMENT_RUNTIME_SWIFT @@ -146,7 +146,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) { __block uint32_t retval = 0; LOCKED(^{ -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 UUID u; long rStatus = UuidCreate(&u); if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1; diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c index b4190a16a6..b2517779d7 100644 --- a/CoreFoundation/Base.subproj/CFUtilities.c +++ b/CoreFoundation/Base.subproj/CFUtilities.c @@ -14,12 +14,12 @@ #include "CFLocaleInternal.h" #include "CFBundle_Internal.h" #include -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 #include #endif #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #endif #if TARGET_OS_ANDROID @@ -291,7 +291,7 @@ static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) { CFRelease(fullVersionString); CFRelease(fullVersion); } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 OSVERSIONINFOEX osvi; ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); @@ -431,7 +431,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { #else int32_t pcnt; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 SYSTEM_INFO sysInfo; GetSystemInfo(&sysInfo); DWORD_PTR activeProcessorMask = sysInfo.dwActiveProcessorMask; @@ -644,7 +644,7 @@ static void _CFShowToFile(FILE *file, Boolean flush, const void *obj) { } cnt = CFStringGetLength(str); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 UniChar *ptr = (UniChar *)CFStringGetCharactersPtr(str); BOOL freePtr = false; if (!ptr) { @@ -768,7 +768,7 @@ static bool also_do_stderr(const _cf_logging_style style) { return result; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 static struct tm *localtime_r(time_t *tv, struct tm *result) { struct tm *tm = localtime(tv); if (tm) { @@ -796,7 +796,7 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%llu] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), tid); asprintf(thread, "%x", pthread_mach_thread_np(pthread_self())); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 bannerLen = asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%lx] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), GetCurrentThreadId()); asprintf(thread, "%lx", GetCurrentThreadId()); #else @@ -820,7 +820,7 @@ static void _logToStderr(char *banner, const char *message, size_t length) { __CFLock(&lock); writev(STDERR_FILENO, v[0].iov_base ? v : v + 1, nv); __CFUnlock(&lock); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 size_t bannerLen = strlen(banner); size_t bufLen = bannerLen + length + 1; char *buf = (char *)malloc(sizeof(char) * bufLen); @@ -1157,7 +1157,7 @@ size_t _CFSuddenTerminationDisablingCount(void) { #include #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #include #define close _close @@ -1272,7 +1272,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean } length = (unsigned long)statBuf.st_size - numBytesRemaining; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 } else { bytes = malloc(statBuf.st_size); DWORD numBytesRead; diff --git a/CoreFoundation/Base.subproj/CFWindowsUtilities.c b/CoreFoundation/Base.subproj/CFWindowsUtilities.c index b180c59126..11608aedc2 100644 --- a/CoreFoundation/Base.subproj/CFWindowsUtilities.c +++ b/CoreFoundation/Base.subproj/CFWindowsUtilities.c @@ -9,7 +9,7 @@ Responsibility: Tony Parker */ -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #include diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h index 026a0f3718..084ac4ce66 100644 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h @@ -33,7 +33,7 @@ #include #include -#if DEPLOYMENT_TARGET_WINDOWS && defined(__cplusplus) +#if TARGET_OS_WIN32 && defined(__cplusplus) extern "C" { #endif @@ -129,7 +129,7 @@ static dispatch_queue_t __ ## PREFIX ## Queue(void) { \ #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Compatibility with boolean.h #if defined(__x86_64__) typedef unsigned int boolean_t; @@ -263,13 +263,13 @@ void OSMemoryBarrier(); #if TARGET_OS_LINUX #include #endif -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX #if !defined(ABS) #define ABS(A) ((A) < 0 ? (-(A)) : (A)) #endif #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define MAXPATHLEN MAX_PATH #undef MAX_PATH @@ -454,7 +454,7 @@ CF_EXPORT int64_t OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *_ #define CF_TEST_PRIVATE CF_PRIVATE #endif -#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || TARGET_OS_WIN32 #include @@ -477,7 +477,7 @@ CF_PRIVATE int asprintf(char **ret, const char *format, ...); #endif -#if DEPLOYMENT_TARGET_WINDOWS && defined(__cplusplus) +#if TARGET_OS_WIN32 && defined(__cplusplus) } // extern "C" #endif diff --git a/CoreFoundation/Base.subproj/ForFoundationOnly.h b/CoreFoundation/Base.subproj/ForFoundationOnly.h index 872db53500..3dc9caf4ab 100644 --- a/CoreFoundation/Base.subproj/ForFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForFoundationOnly.h @@ -55,7 +55,7 @@ CF_IMPLICIT_BRIDGING_DISABLED #include #endif -#if (INCLUDE_OBJC || TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT +#if (INCLUDE_OBJC || TARGET_OS_MAC || TARGET_OS_WIN32) && !DEPLOYMENT_RUNTIME_SWIFT #include #endif @@ -425,7 +425,7 @@ CF_EXPORT CFErrorUserInfoKeyCallBack _Nullable CFErrorGetCallBackForDomain(CFStr _CF_EXPORT_SCOPE_END // ---- Windows-specific material --------------------------------------- -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include @@ -576,7 +576,7 @@ CF_EXPORT CFRange _CFDataFindBytes(CFDataRef data, CFDataRef dataToFind, CFRange #if !defined(__CFReadTSR) #define __CFReadTSR() mach_absolute_time() #endif -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #if 0 CF_INLINE UInt64 __CFReadTSR(void) { LARGE_INTEGER freq; diff --git a/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h b/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h index 684cf8727b..1c0ddba386 100644 --- a/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h @@ -28,7 +28,7 @@ #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define NOMINMAX #define WIN32_LEAN_AND_MEAN #include @@ -375,7 +375,7 @@ CF_EXPORT char *_Nullable *_Nonnull _CFEnviron(void); CF_EXPORT void CFLog1(CFLogLevel lev, CFStringRef message); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 typedef HANDLE _CFThreadRef; typedef struct _CFThreadAttributes { DWORD dwSizeOfAttributes; @@ -595,7 +595,7 @@ _stat_with_btime(const char *filename, struct stat *buffer, struct timespec *bti #warning "Enabling statx" #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_EXPORT void __CFSocketInitializeWinSock(void); #endif diff --git a/CoreFoundation/CMakeLists.txt b/CoreFoundation/CMakeLists.txt index 97586bdf23..0a1f006aff 100644 --- a/CoreFoundation/CMakeLists.txt +++ b/CoreFoundation/CMakeLists.txt @@ -348,9 +348,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) target_compile_definitions(CoreFoundation PRIVATE -D_DLL) - target_compile_definitions(CoreFoundation - PRIVATE - -DDEPLOYMENT_TARGET_WINDOWS) if(BUILD_SHARED_LIBS) target_compile_definitions(CoreFoundation PRIVATE diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index 8e113dcea2..1fddd2b30b 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -37,7 +37,7 @@ static Boolean _CFDataShouldBridgeToSwift(CFTypeID type, CFDataRef data); #if TARGET_OS_MAC #include CF_INLINE unsigned long __CFPageSize() { return vm_page_size; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 CF_INLINE unsigned long __CFPageSize() { SYSTEM_INFO sysInfo; GetSystemInfo(&sysInfo); diff --git a/CoreFoundation/Error.subproj/CFError.c b/CoreFoundation/Error.subproj/CFError.c index 8e185e5431..77dd9d2612 100644 --- a/CoreFoundation/Error.subproj/CFError.c +++ b/CoreFoundation/Error.subproj/CFError.c @@ -250,7 +250,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { if (reason) { CFStringRef const backstopComboString = CFSTR("%@ %@"); CFStringRef comboString = backstopComboString; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (cfBundle) comboString = CFCopyLocalizedStringFromTableInBundle(CFSTR("%@ %@"), CFSTR("Error"), cfBundle, "Used for presenting the 'what failed' and 'why it failed' sections of an error message, where each one is one or more complete sentences. The first %@ corresponds to the 'what failed' (For instance 'The file could not be saved.') and the second one 'why it failed' (For instance 'The volume is out of space.')"); #endif @@ -265,7 +265,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 // Cache the CF bundle since we will be using it for localized strings. Note that for platforms without bundle support we also go this non-localized route. CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation")); if (!cfBundle) { // This should be rare, but has been observed in the wild, due to running out of file descriptors. Normally we might not go to such extremes, but since we want to be able to present reasonable errors even in the case of errors such as running out of file descriptors, why not. This is CFError after all. !!! Be sure to have the same logic here as below for going through various options for fetching the strings. @@ -281,7 +281,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) { } if (reasonOrDesc) CFRelease(reasonOrDesc); return result; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 } // Then look for kCFErrorLocalizedFailureReasonKey; if there, create a full sentence from that. diff --git a/CoreFoundation/Locale.subproj/CFCalendar.c b/CoreFoundation/Locale.subproj/CFCalendar.c index 1d37039019..99c4282074 100644 --- a/CoreFoundation/Locale.subproj/CFCalendar.c +++ b/CoreFoundation/Locale.subproj/CFCalendar.c @@ -45,7 +45,7 @@ CF_PRIVATE Boolean __calcNextDaylightSavingTimeTransition(UCalendar *ucal, UDate } UErrorCode status = U_ZERO_ERROR; ucal_setMillis(ucal, start_udate, &status); -#if DEPLOYMENT_TARGET_WINDOWS // TODO: Unify this and CFTimeZoneGetNextDaylightSavingTimeTransition. +#if TARGET_OS_WIN32 // TODO: Unify this and CFTimeZoneGetNextDaylightSavingTimeTransition. UBool b = false; #else UBool b = ucal_getTimeZoneTransitionDate(ucal, UCAL_TZ_TRANSITION_NEXT, answer, &status); diff --git a/CoreFoundation/Locale.subproj/CFDateFormatter.c b/CoreFoundation/Locale.subproj/CFDateFormatter.c index df3920b807..36613bdc91 100644 --- a/CoreFoundation/Locale.subproj/CFDateFormatter.c +++ b/CoreFoundation/Locale.subproj/CFDateFormatter.c @@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status); } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) { int32_t years = 0; __cficu_ucal_clear(calendar); @@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter } } } else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX __cficu_ucal_clear(cal); __cficu_ucal_set(cal, UCAL_ERA, 1); __cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status); diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c index dee357cfaa..3cabdbd55b 100644 --- a/CoreFoundation/Locale.subproj/CFLocale.c +++ b/CoreFoundation/Locale.subproj/CFLocale.c @@ -23,7 +23,7 @@ #include "CFBundle_Internal.h" #include "CFLocaleInternal.h" #include -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX || TARGET_OS_BSD +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_BSD #include // ICU locales #include // ICU locale data #include @@ -298,7 +298,7 @@ static void _setCachedCurrentLocale(CFLocaleRef newLocale) { #define FALLBACK_LOCALE_NAME CFSTR("en_US") #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 static CFStringRef _CFLocaleCopyLocaleIdentifierByAddingLikelySubtags(CFStringRef localeID) { CFStringRef result = NULL; @@ -526,7 +526,7 @@ CFStringRef _CFLocaleCreateLocaleIdentiferByReplacingLanguageCodeAndScriptCode(C } #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray); /// Creates a new locale identifier by identifying the most preferred localization (using `availableLocalizations` and `preferredLanguages`) and then creating a locale based on the most preferred localization, while retaining any relevant attributes from `preferredLocaleID`, e.g. if `availableLocalizations` is `[ "en", "fr", "de" ]`, `preferredLanguages` is `[ "ar-AE", "en-AE" ]`, `preferredLocaleID` is `ar_AE@numbers=arab;calendar=islamic-civil`, it will return `en_AE@calendar=islamic-civil`, i.e. the language will be matched to `en` since that’s the only available localization that matches, `calendar` will be retained since it’s language-agnostic, but `numbers` will be discarded because the `arab` numbering system is not valid for `en`. @@ -585,7 +585,7 @@ static CFLocaleRef _CFLocaleCopyCurrentGuts(CFStringRef name, Boolean useCache, // things which call this function thousands or millions of times in // a short period. if (!name) { -#if 0 // TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if 0 // TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX name = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication); #endif } else { @@ -891,7 +891,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C langPref = (CFArrayRef)CFDictionaryGetValue(displayLocale->_prefs, CFSTR("AppleLanguages")); if (langPref) CFRetain(langPref); } else { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX langPref = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); #endif } @@ -916,7 +916,7 @@ CFStringRef CFLocaleCopyDisplayNameForPropertyValue(CFLocaleRef displayLocale, C } CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX int32_t locale, localeCount = uloc_countAvailable(); CFMutableSetRef working = CFSetCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeSetCallBacks); for (locale = 0; locale < localeCount; ++locale) { @@ -937,7 +937,7 @@ CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) { #endif } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static CFArrayRef __CFLocaleCopyCStringsAsArray(const char* const* p) { CFMutableArrayRef working = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); for (; *p; ++p) { @@ -977,7 +977,7 @@ static CFArrayRef __CFLocaleCopyUEnumerationAsArray(UEnumeration *enumer, UError #endif CFArrayRef CFLocaleCopyISOLanguageCodes(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX const char* const* p = uloc_getISOLanguages(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -986,7 +986,7 @@ CFArrayRef CFLocaleCopyISOLanguageCodes(void) { } CFArrayRef CFLocaleCopyISOCountryCodes(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX const char* const* p = uloc_getISOCountries(); return __CFLocaleCopyCStringsAsArray(p); #else @@ -995,7 +995,7 @@ CFArrayRef CFLocaleCopyISOCountryCodes(void) { } CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_ALL, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1007,7 +1007,7 @@ CFArrayRef CFLocaleCopyISOCurrencyCodes(void) { } CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; UEnumeration *enumer = ucurr_openISOCurrencies(UCURR_COMMON|UCURR_NON_DEPRECATED, &icuStatus); CFArrayRef result = __CFLocaleCopyUEnumerationAsArray(enumer, &icuStatus); @@ -1019,7 +1019,7 @@ CFArrayRef CFLocaleCopyCommonISOCurrencyCodes(void) { } CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef allocator, uint32_t lcid) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char buffer[kMaxICUNameSize]; UErrorCode status = U_ZERO_ERROR; int32_t ret = uloc_getLocaleForLCID(lcid, buffer, kMaxICUNameSize, &status); @@ -1034,7 +1034,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromWindowsLocaleCode(CFAllocatorRef a } uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIdentifier) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFStringRef ident = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorSystemDefault, localeIdentifier); char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = ident ? CFStringGetCString(ident, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; @@ -1046,7 +1046,7 @@ uint32_t CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier(CFStringRef localeIden } CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoLangCode) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1066,7 +1066,7 @@ CFLocaleLanguageDirection CFLocaleGetLanguageCharacterDirection(CFStringRef isoL } CFLocaleLanguageDirection CFLocaleGetLanguageLineDirection(CFStringRef isoLangCode) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; Boolean b = isoLangCode ? CFStringGetCString(isoLangCode, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII) : false; CFLocaleLanguageDirection dir; @@ -1118,7 +1118,7 @@ _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) { #endif } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray) { CFMutableArrayRef newArray = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks); if (languagesArray && (CFArrayGetTypeID() == CFGetTypeID(languagesArray))) { @@ -1138,7 +1138,7 @@ static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesA #endif CFArrayRef CFLocaleCopyPreferredLanguages(void) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 CFArrayRef languagesArray = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); CFArrayRef result = _CFLocaleCopyPreferredLanguagesFromPrefs(languagesArray); if (languagesArray) CFRelease(languagesArray); @@ -1180,7 +1180,7 @@ static bool __CFLocaleCopyCodes(CFLocaleRef locale, bool user, CFTypeRef *cf, CF return false; } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { UErrorCode icuErr = U_ZERO_ERROR; CFMutableCharacterSetRef working = CFCharacterSetCreateMutable(NULL); @@ -1236,7 +1236,7 @@ CFCharacterSetRef _CFCreateCharacterSetFromUSet(USet *set) { #endif static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1257,7 +1257,7 @@ static bool __CFLocaleCopyExemplarCharSet(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1275,7 +1275,7 @@ static bool __CFLocaleCopyICUKeyword(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyICUCalendarID(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context, const char *keyword) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { UErrorCode icuStatus = U_ZERO_ERROR; @@ -1360,7 +1360,7 @@ static bool __CFLocaleCopyCalendarID(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (__CFLocaleCopyCalendarID(locale, user, cf, context)) { CFCalendarRef calendar = _CFCalendarCreateCoWWithIdentifier((CFStringRef)*cf); CFCalendarSetLocale(calendar, locale); @@ -1394,7 +1394,7 @@ static bool __CFLocaleCopyCalendar(CFLocaleRef locale, bool user, CFTypeRef *cf, } static bool __CFLocaleCopyDelimiter(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX ULocaleDataDelimiterType type = (ULocaleDataDelimiterType)0; if (context == kCFLocaleQuotationBeginDelimiterKey) { type = ULOCDATA_QUOTATION_START; @@ -1517,7 +1517,7 @@ static CFStringRef _CFLocaleGetTemperatureUnitName(bool celsius) { } #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" @@ -1560,7 +1560,7 @@ static bool __CFLocaleGetMeasurementSystemForName(CFStringRef name, UMeasuremen #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UMeasurementSystem *outMeasurementSystem) { UMeasurementSystem output = UMS_SI; // Default is Metric bool done = false; @@ -1590,7 +1590,7 @@ static void __CFLocaleGetMeasurementSystemGuts(CFLocaleRef locale, bool user, UM static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = system != UMS_US ? kCFBooleanTrue : kCFBooleanFalse; @@ -1602,7 +1602,7 @@ static bool __CFLocaleCopyUsesMetric(CFLocaleRef locale, bool user, CFTypeRef *c } static bool __CFLocaleCopyMeasurementSystem(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX UMeasurementSystem system = UMS_SI; __CFLocaleGetMeasurementSystemGuts(locale, user, &system); *cf = CFRetain(__CFLocaleGetMeasurementSystemName(system)); @@ -1625,7 +1625,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR done = _CFLocaleGetTemperatureUnitForPreferences(temperatureUnitPref, &celsius); } #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (!done) { char localeID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (CFStringGetCString(locale->_identifier, localeID, sizeof(localeID)/sizeof(char), kCFStringEncodingASCII)) { @@ -1663,7 +1663,7 @@ static bool __CFLocaleCopyTemperatureUnit(CFLocaleRef locale, bool user, CFTypeR static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterDecimalStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1679,7 +1679,7 @@ static bool __CFLocaleCopyNumberFormat(CFLocaleRef locale, bool user, CFTypeRef // so we have to have another routine here which creates a Currency number formatter. static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef *cf, CFStringRef context) { CFStringRef str = NULL; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFNumberFormatterRef nf = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale, kCFNumberFormatterCurrencyStyle); str = nf ? (CFStringRef)CFNumberFormatterCopyProperty(nf, context) : NULL; if (nf) CFRelease(nf); @@ -1691,7 +1691,7 @@ static bool __CFLocaleCopyNumberFormat2(CFLocaleRef locale, bool user, CFTypeRef return false; } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX typedef int32_t (*__CFICUFunction)(const char *, const char *, UChar *, int32_t, UErrorCode *); static bool __CFLocaleICUName(const char *locale, const char *valLocale, CFStringRef *out, __CFICUFunction icu) { @@ -1763,7 +1763,7 @@ static bool __CFLocaleICUCurrencyName(const char *locale, const char *value, UCu #endif static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX UErrorCode icuStatus = U_ZERO_ERROR; int32_t size; UChar name[kMaxICUNameSize]; @@ -1796,7 +1796,7 @@ static bool __CFLocaleFullName(const char *locale, const char *value, CFStringRe } static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX return __CFLocaleICUName(locale, value, out, uloc_getDisplayLanguage); #else *out = CFRetain(CFSTR("(none)")); @@ -1805,7 +1805,7 @@ static bool __CFLocaleLanguageName(const char *locale, const char *value, CFStri } static bool __CFLocaleCountryName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) < sizeof(lid) - 3) { @@ -1821,7 +1821,7 @@ static bool __CFLocaleCountryName(const char *locale, const char *value, CFStrin } static bool __CFLocaleScriptName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY]; if (strlen(value) == 4) { @@ -1838,7 +1838,7 @@ static bool __CFLocaleScriptName(const char *locale, const char *value, CFString } static bool __CFLocaleVariantName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX // Need to make a fake locale ID char lid[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; if (strlen(value) < sizeof(lid) - 6) { @@ -1854,7 +1854,7 @@ static bool __CFLocaleVariantName(const char *locale, const char *value, CFStrin } static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCalendarKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1863,7 +1863,7 @@ static bool __CFLocaleCalendarName(const char *locale, const char *value, CFStri } static bool __CFLocaleCollationName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX return __CFLocaleICUKeywordValueName(locale, value, kCollationKeyword, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1872,7 +1872,7 @@ static bool __CFLocaleCollationName(const char *locale, const char *value, CFStr } static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_SYMBOL_NAME, out); #else *out = CFRetain(CFSTR("(none)")); @@ -1881,7 +1881,7 @@ static bool __CFLocaleCurrencyShortName(const char *locale, const char *value, C } static bool __CFLocaleCurrencyFullName(const char *locale, const char *value, CFStringRef *out) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX return __CFLocaleICUCurrencyName(locale, value, UCURR_LONG_NAME, out); #else *out = CFRetain(CFSTR("(none)")); diff --git a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c index 21a256be15..9b8f3f32cc 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c +++ b/CoreFoundation/Locale.subproj/CFLocaleIdentifier.c @@ -58,7 +58,7 @@ #include #include #include -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX #include #else #define ULOC_KEYWORD_SEPARATOR '@' @@ -1155,7 +1155,7 @@ enum { }; */ -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX struct LocaleToLegacyCodes { const char * locale; // reduced to language plus one other component (script, region, variant), separators normalized to'_' @@ -1593,7 +1593,7 @@ static void _UpdateFullLocaleString(char inLocaleString[], int locStringMaxLen, // If so, copy the keywords to varKeyValueString and delete the variant tag // from the original string (but don't otherwise use the ICU canonicalization). varKeyValueString[0] = 0; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (variantTag) { UErrorCode icuStatus; int icuCanonStringLen; @@ -1720,7 +1720,7 @@ static void _GetKeyValueString(char inLocaleString[], char keyValueString[]) { } static void _AppendKeyValueString(char inLocaleString[], int locStringMaxLen, char keyValueString[]) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (keyValueString[0] != 0) { UErrorCode uerr = U_ZERO_ERROR; UEnumeration * uenum = uloc_openKeywords(keyValueString, &uerr); @@ -1952,12 +1952,12 @@ SPI: CFLocaleGetLanguageRegionEncodingForLocaleIdentifier gets the appropriate preferred localization in the current context (this function returns NO for a NULL localeIdentifier); and in this function langCode, regCode, and scriptCode are all SInt16* (not SInt32* like the equivalent parameters in CFBundleGetLocalizationInfoForLocalization). */ -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ); #endif Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeIdentifier, LangCode *langCode, RegionCode *regCode, ScriptCode *scriptCode, CFStringEncoding *stringEncoding) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX Boolean returnValue = false; CFStringRef canonicalIdentifier = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, localeIdentifier); if (canonicalIdentifier) { @@ -2035,7 +2035,7 @@ Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef localeI #endif } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *entry2 ) { const char * localeString1 = ((const LocaleToLegacyCodes *)entry1)->locale; const char * localeString2 = ((const LocaleToLegacyCodes *)entry2)->locale; @@ -2045,7 +2045,7 @@ static int CompareLocaleToLegacyCodesEntries( const void *entry1, const void *en CFDictionaryRef CFLocaleCreateComponentsFromLocaleIdentifier(CFAllocatorRef allocator, CFStringRef localeID) { CFMutableDictionaryRef working = CFDictionaryCreateMutable(allocator, 10, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX char cLocaleID[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; char buffer[ULOC_FULLNAME_CAPACITY+ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -2175,7 +2175,7 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato free(variant); free(buf1); -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX for (CFIndex idx = 0; idx < cnt; idx++) { if (keys[idx]) { char *key = __CStringFromString(keys[idx]); diff --git a/CoreFoundation/Locale.subproj/CFLocaleKeys.c b/CoreFoundation/Locale.subproj/CFLocaleKeys.c index 3cbc2f2fc8..ded0598d19 100644 --- a/CoreFoundation/Locale.subproj/CFLocaleKeys.c +++ b/CoreFoundation/Locale.subproj/CFLocaleKeys.c @@ -133,7 +133,7 @@ CONST_STRING_DECL(kCFCalendarIdentifierEthiopicAmeteMihret, "ethiopic"); CONST_STRING_DECL(kCFCalendarIdentifierEthiopicAmeteAlem, "ethiopic-amete-alem"); // Aliases for Linux -#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_LINUX || TARGET_OS_WIN32 CF_EXPORT CFStringRef const kCFBuddhistCalendar __attribute__((alias ("kCFCalendarIdentifierBuddhist"))); CF_EXPORT CFStringRef const kCFChineseCalendar __attribute__((alias ("kCFCalendarIdentifierChinese"))); diff --git a/CoreFoundation/NumberDate.subproj/CFDate.c b/CoreFoundation/NumberDate.subproj/CFDate.c index ca44fa2a82..4fe079392a 100644 --- a/CoreFoundation/NumberDate.subproj/CFDate.c +++ b/CoreFoundation/NumberDate.subproj/CFDate.c @@ -120,7 +120,7 @@ CF_EXPORT CFTimeInterval CFGetSystemUptime(void) { HALT; } return (double)res.tv_sec + ((double)res.tv_nsec)/1.0E9; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 ULONGLONG ullTickCount = GetTickCount64(); return ullTickCount / 1000; #else @@ -169,7 +169,7 @@ CF_PRIVATE void __CFDateInitialize(void) { mach_timebase_info(&info); __CFTSRRate = (1.0E9 / (double)info.numer) * (double)info.denom; __CF1_TSRRate = 1.0 / __CFTSRRate; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 LARGE_INTEGER freq; if (!QueryPerformanceFrequency(&freq)) { HALT; @@ -360,7 +360,7 @@ CFAbsoluteTime CFGregorianDateGetAbsoluteTime(CFGregorianDate gdate, CFTimeZoneR CFAbsoluteTime at; at = 86400.0 * __CFAbsoluteFromYMD(gdate.year - 2001, gdate.month, gdate.day); at += 3600.0 * gdate.hour + 60.0 * gdate.minute + gdate.second; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -379,7 +379,7 @@ CFGregorianDate CFAbsoluteTimeGetGregorianDate(CFAbsoluteTime at, CFTimeZoneRef int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -407,7 +407,7 @@ CFAbsoluteTime CFAbsoluteTimeAddGregorianUnits(CFAbsoluteTime at, CFTimeZoneRef CFAbsoluteTime candidate_at0, candidate_at1; uint8_t monthdays; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -526,7 +526,7 @@ CFGregorianUnits CFAbsoluteTimeGetDifferenceAsGregorianUnits(CFAbsoluteTime at1, SInt32 CFAbsoluteTimeGetDayOfWeek(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute; CFAbsoluteTime fixedat; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -542,7 +542,7 @@ SInt32 CFAbsoluteTimeGetDayOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { CFAbsoluteTime fixedat; int64_t absolute, year; int8_t month, day; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } @@ -561,7 +561,7 @@ SInt32 CFAbsoluteTimeGetWeekOfYear(CFAbsoluteTime at, CFTimeZoneRef tz) { int64_t absolute, year; int8_t month, day; CFAbsoluteTime fixedat; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (NULL != tz) { __CFGenericValidateType(tz, CFTimeZoneGetTypeID()); } diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c index 9f3f12ec2d..9133dc2828 100644 --- a/CoreFoundation/NumberDate.subproj/CFNumber.c +++ b/CoreFoundation/NumberDate.subproj/CFNumber.c @@ -75,7 +75,7 @@ static const uint8_t __CFNumberCanonicalTypeIndex[] = { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define copysign(A, B) _copysign(A, B) #endif @@ -184,7 +184,7 @@ static const Float64Bits doubleOneBits = {.floatValue = 1.0f}; #define FLOAT_POSITIVE_2_TO_THE_64 0x1.0p+64L #define FLOAT_NEGATIVE_2_TO_THE_127 -0x1.0p+127L #define FLOAT_POSITIVE_2_TO_THE_127 0x1.0p+127L -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define FLOAT_POSITIVE_2_TO_THE_64 18446744073709551616.0 #define FLOAT_NEGATIVE_2_TO_THE_127 -170141183460469231731687303715884105728.0 #define FLOAT_POSITIVE_2_TO_THE_127 170141183460469231731687303715884105728.0 diff --git a/CoreFoundation/Parsing.subproj/CFPropertyList.c b/CoreFoundation/Parsing.subproj/CFPropertyList.c index fd2a8d5acf..a004c9cf79 100644 --- a/CoreFoundation/Parsing.subproj/CFPropertyList.c +++ b/CoreFoundation/Parsing.subproj/CFPropertyList.c @@ -2320,7 +2320,7 @@ static CFStringEncoding encodingForXMLData(CFDataRef data, CFErrorRef *error, CF if (len == 5 && (*base == 'u' || *base == 'U') && (base[1] == 't' || base[1] == 'T') && (base[2] == 'f' || base[2] == 'F') && (base[3] == '-') && (base[4] == '8')) return kCFStringEncodingUTF8; encodingName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, base, len, kCFStringEncodingISOLatin1, false); -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFStringEncoding enc = CFStringConvertIANACharSetNameToEncoding(encodingName); if (enc != kCFStringEncodingInvalidId) { CFRelease(encodingName); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/CoreFoundation/PlugIn.subproj/CFBundle.c index f06ab0c90a..9847c4216f 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle.c @@ -41,7 +41,7 @@ #if TARGET_OS_MAC #include -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #include #include #endif @@ -163,7 +163,7 @@ static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) { #endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles() { -#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID return true; #else return false; @@ -706,7 +706,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL, localVersion = _CFBundleGetBundleVersionForURL(newURL); if (localVersion == 3) { SInt32 res = _CFGetPathProperties(allocator, (char *)buff, &exists, &mode, NULL, NULL, NULL, NULL); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (!(res == 0 && exists && ((mode & S_IFMT) == S_IFDIR))) { // 2nd chance at finding a bundle path - remove the last path component (e.g., mybundle.resources) and try again CFURLRef shorterPath = CFURLCreateCopyDeletingLastPathComponent(allocator, newURL); @@ -1460,7 +1460,7 @@ CF_PRIVATE Boolean _CFBundleCouldBeBundle(CFURLRef url) { //If 'permissive' is set, we will maintain the historical behavior of returning frameworks with names that don't match, and frameworks for executables in Resources/ static CFURLRef __CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath, Boolean permissive) { // MF:!!! Implement me. We need to be able to find the bundle from the exe, dealing with old vs. new as well as the Executables dir business on Windows. -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 UniChar executablesToFrameworksPathBuff[] = {'.', '.', '\\', 'F', 'r', 'a', 'm', 'e', 'w', 'o', 'r', 'k', 's'}; UniChar executablesToPrivateFrameworksPathBuff[] = {'.', '.', '\\', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'F', 'r', 'a', 'm', 'e', 'w', 'o', 'r', 'k', 's'}; UniChar frameworksExtension[] = {'f', 'r', 'a', 'm', 'e', 'w', 'o', 'r', 'k'}; @@ -1485,7 +1485,7 @@ static CFURLRef __CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executab length = _CFLengthAfterDeletingLastPathComponent(pathBuff, length); savedLength = length; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // * (Windows-only) First check the "Executables" directory parallel to the "Frameworks" directory case. if (_CFAppendPathComponent(pathBuff, &length, CFMaxPathSize, executablesToFrameworksPathBuff, LENGTH_OF(executablesToFrameworksPathBuff)) && _CFAppendPathComponent(pathBuff, &length, CFMaxPathSize, nameBuff, nameLength) && _CFAppendPathExtension(pathBuff, &length, CFMaxPathSize, frameworksExtension, LENGTH_OF(frameworksExtension))) { CFStringSetExternalCharactersNoCopy(cheapStr, pathBuff, length, CFMaxPathSize); diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h index 27edea4e7b..850d94f272 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h +++ b/CoreFoundation/PlugIn.subproj/CFBundle_BinaryTypes.h @@ -24,7 +24,7 @@ CF_EXTERN_C_BEGIN #define BINARY_SUPPORT_DYLD 1 #define BINARY_SUPPORT_DLFCN 1 #define USE_DYLD_PRIV 1 -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define BINARY_SUPPORT_DLL 1 #elif TARGET_OS_LINUX || TARGET_OS_BSD #define BINARY_SUPPORT_DLFCN 1 diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index 8307882594..f6ea2802f9 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -16,7 +16,7 @@ #include #endif -#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID #if TARGET_OS_LINUX #if TARGET_RT_64_BIT @@ -49,7 +49,7 @@ _kCFBundleFHSDirectory_lib #endif // TARGET_OS_LINUX -#endif // !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID // This is here because on iPhoneOS with the dyld shared cache, we remove binaries from their // original locations on disk, so checking whether a binary's path exists is no longer sufficient. @@ -74,7 +74,7 @@ static CFURLRef _CFBundleCopyExecutableURLRaw(CFURLRef urlPath, CFStringRef exeN CFURLRef executableURL = NULL; if (!urlPath || !exeName) return NULL; -#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 if (!executableURL) { executableURL = CFURLCreateWithFileSystemPathRelativeToBase(kCFAllocatorSystemDefault, exeName, kCFURLPOSIXPathStyle, false, urlPath); if (!_binaryLoadable(executableURL)) { @@ -117,7 +117,7 @@ static CFURLRef _CFBundleCopyExecutableURLRaw(CFURLRef urlPath, CFStringRef exeN executableURL = NULL; } } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 if (!executableURL) { executableURL = CFURLCreateWithFileSystemPathRelativeToBase(kCFAllocatorSystemDefault, exeName, kCFURLWindowsPathStyle, false, urlPath); if (executableURL && !_binaryLoadable(executableURL)) { @@ -200,7 +200,7 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL Boolean doExecSearch = true; #endif -#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID if (lookupMainExe && bundle && bundle->_isFHSInstalledBundle) { // For a FHS installed bundle, the URL points to share/Bundle.resources, and the binary is in: @@ -224,13 +224,13 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL CFRelease(prefixPath); } -#endif // !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID // Now, look for the executable inside the bundle. if (!foundIt && doExecSearch && 0 != version) { CFURLRef exeDirURL = NULL; -#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID if (bundle && bundle->_isFHSInstalledBundle) { CFURLRef withoutExtension = CFURLCreateCopyDeletingPathExtension(kCFAllocatorSystemDefault, url); CFStringRef lastPathComponent = CFURLCopyLastPathComponent(withoutExtension); @@ -245,13 +245,13 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL CFRelease(libexec); CFRelease(exeDirName); } else -#endif // !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID if (1 == version) { exeDirURL = CFURLCreateWithString(kCFAllocatorSystemDefault, _CFBundleExecutablesURLFromBase1, url); } else if (2 == version) { exeDirURL = CFURLCreateWithString(kCFAllocatorSystemDefault, _CFBundleExecutablesURLFromBase2, url); } else { -#if DEPLOYMENT_TARGET_WINDOWS || !DEPLOYMENT_RUNTIME_OBJC +#if TARGET_OS_WIN32 || !DEPLOYMENT_RUNTIME_OBJC // On Windows and on targets that support FHS bundles, if the bundle URL is foo.resources, then the executable is at the same level as the .resources directory CFStringRef extension = CFURLCopyPathExtension(url); if (extension && CFEqual(extension, _CFBundleSiblingResourceDirectoryExtension)) { @@ -276,7 +276,7 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL // If this was an old bundle, or we did not find the executable in the Executables subdirectory, look directly in the bundle wrapper. if (!executableURL) executableURL = _CFBundleCopyExecutableURLRaw(url, executableName); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Windows only: If we still haven't found the exe, look in the Executables folder. // But only for the main bundle exe if (lookupMainExe && !executableURL) { @@ -315,7 +315,7 @@ static CFURLRef _CFBundleCopyBundleURLForExecutablePath(CFStringRef str) { if (buffLen > CFMaxPathSize) buffLen = CFMaxPathSize; CFStringGetCharacters(str, CFRangeMake(0, buffLen), buff); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Is this a .dll or .exe? if (buffLen >= 5 && (_wcsnicmp((wchar_t *)&(buff[buffLen-4]), L".dll", 4) == 0 || _wcsnicmp((wchar_t *)&(buff[buffLen-4]), L".exe", 4) == 0)) { CFIndex extensionLength = CFStringGetLength(_CFBundleSiblingResourceDirectoryExtension); @@ -392,7 +392,7 @@ static CFURLRef _CFBundleCopyResolvedURLForExecutableURL(CFURLRef url) { if (len1 > 0 && len1 + 1 < buffLen) { str1 = CFStringCreateWithCharacters(kCFAllocatorSystemDefault, buff, len1); CFIndex skipSlashCount = 1; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // On Windows, _CFLengthAfterDeletingLastPathComponent will return a value of 3 if the path is at the root (e.g. C:\). This includes the \, which is not the case for URLs with subdirectories if (len1 == 3 && buff[1] == ':' && buff[2] == '\\') { skipSlashCount = 0; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c index ebd7dc1e7c..22bb7d74a0 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Grok.c @@ -27,7 +27,7 @@ #include #endif #include -#if !DEPLOYMENT_TARGET_WINDOWS +#if !TARGET_OS_WIN32 #include #endif @@ -38,7 +38,7 @@ #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define statinfo _stat #define stat(x,y) _NS_stat(x,y) #define open _NS_open diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c index 68aa36a185..51b2579a1c 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c @@ -34,7 +34,7 @@ #include #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #include #include @@ -172,7 +172,7 @@ CF_EXPORT CFArrayRef CFBundleCopyResourceURLsOfTypeInDirectory(CFURLRef bundleUR #pragma mark - -#if TARGET_OS_OSX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_WIN32 CF_INLINE Boolean _CFBundleURLHasSubDir(CFURLRef url, CFStringRef subDirName) { Boolean isDir = false, result = false; CFURLRef dirURL = CFURLCreateWithString(kCFAllocatorSystemDefault, subDirName, url); @@ -198,7 +198,7 @@ CF_PRIVATE uint8_t _CFBundleGetBundleVersionForURL(CFURLRef url) { CFRelease(absoluteURL); Boolean hasFrameworkSuffix = CFStringHasSuffix(CFURLGetString(url), CFSTR(".framework/")); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 hasFrameworkSuffix = hasFrameworkSuffix || CFStringHasSuffix(CFURLGetString(url), CFSTR(".framework\\")); #endif @@ -257,7 +257,7 @@ CF_PRIVATE uint8_t _CFBundleGetBundleVersionForURL(CFURLRef url) { } } -#if TARGET_OS_OSX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_OSX || TARGET_OS_WIN32 // Do a more substantial check for the subdirectories that make up version 0/1/2 bundles. These are sometimes symlinks (like in Frameworks) and they would have been missed by our check above. // n.b. that the readdir above may return DT_UNKNOWN, for example, when the directory is on a network mount. if (foundUnknown && localVersion == 3) { @@ -290,7 +290,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { return CFSTR("MacOS"); #elif TARGET_OS_IPHONE return CFSTR("iPhoneOS"); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 return CFSTR("Windows"); #elif DEPLOYMENT_TARGET_SOLARIS return CFSTR("Solaris"); @@ -312,7 +312,7 @@ CF_EXPORT CFStringRef _CFBundleGetCurrentPlatform(void) { CF_PRIVATE CFStringRef _CFBundleGetPlatformExecutablesSubdirectoryName(void) { #if TARGET_OS_MAC return CFSTR("MacOS"); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 return CFSTR("Windows"); #elif DEPLOYMENT_TARGET_SOLARIS return CFSTR("Solaris"); diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index e4365d200d..0988fd21ca 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -48,7 +48,7 @@ CF_INLINE uint64_t check_uint64_add(uint64_t x, uint64_t y, int32_t* err) { }; #endif -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 #define USE_DISPATCH_SOURCE_FOR_TIMERS __HAS_DISPATCH__ #define USE_MK_TIMER_TOO 1 #else @@ -122,7 +122,7 @@ extern void _dispatch_main_queue_callback_4CF(void *_Null_unspecified msg); #endif -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX CF_EXPORT _CFThreadRef _CF_pthread_main_thread_np(void); #define pthread_main_thread_np() _CF_pthread_main_thread_np() #endif @@ -150,7 +150,7 @@ static void _runLoopTimerWithBlockContext(CFRunLoopTimerRef timer, void *opaqueB #define CRASH(string, errcode) do { char msg[256]; snprintf(msg, 256, string, errcode); CRSetCrashLogMessage(msg); HALT; } while (0) -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 static _CFThreadRef const kNilPthreadT = INVALID_HANDLE_VALUE; #define pthreadPointer(a) a @@ -213,7 +213,7 @@ static _CFThreadRef const kNilPthreadT = (_CFThreadRef)0; // NOTE: this is locally defined rather than in CFInternal.h as on Linux, // `linux/sysctl.h` defines `struct __sysctl_args` with an `__unused` member // which breaks the build. -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_CYGWIN || TARGET_OS_LINUX #ifndef __unused #if __has_attribute(unused) #define __unused __attribute__((unused)) @@ -400,7 +400,7 @@ CF_INLINE void __CFPortSetFree(__CFPortSet portSet) { } } -#elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN +#elif TARGET_OS_WIN32 || TARGET_OS_CYGWIN typedef HANDLE __CFPort; #define CFPORT_NULL NULL @@ -604,7 +604,7 @@ CF_INLINE int64_t __CFUInt64ToAbsoluteTime(int64_t x) { return x; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 static HANDLE mk_timer_create(void) { return CreateWaitableTimer(NULL, FALSE, NULL); @@ -687,7 +687,7 @@ struct __CFRunLoopMode { __CFPort _timerPort; Boolean _mkTimerArmed; #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 DWORD _msgQMask; void (*_msgPump)(void); #endif @@ -729,7 +729,7 @@ static CFStringRef __CFRunLoopModeCopyDescription(CFTypeRef cf) { #if USE_MK_TIMER_TOO CFStringAppendFormat(result, NULL, CFSTR("timer port = 0x%x, "), rlm->_timerPort); #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CFStringAppendFormat(result, NULL, CFSTR("MSGQ mask = %p, "), rlm->_msgQMask); #endif CFStringAppendFormat(result, NULL, CFSTR("\n\tsources0 = %@,\n\tsources1 = %@,\n\tobservers = %@,\n\ttimers = %@,\n\tcurrently %0.09g (%lld) / soft deadline in: %0.09g sec (@ %lld) / hard deadline in: %0.09g sec (@ %lld)\n},\n"), rlm->_sources0, rlm->_sources1, rlm->_observers, rlm->_timers, CFAbsoluteTimeGetCurrent(), mach_absolute_time(), __CFTSRToTimeInterval(rlm->_timerSoftDeadline - mach_absolute_time()), rlm->_timerSoftDeadline, __CFTSRToTimeInterval(rlm->_timerHardDeadline - mach_absolute_time()), rlm->_timerHardDeadline); @@ -875,7 +875,7 @@ static CFStringRef __CFRunLoopCopyDescription(CFTypeRef cf) { CFRunLoopRef rl = (CFRunLoopRef)cf; CFMutableStringRef result; result = CFStringCreateMutable(kCFAllocatorSystemDefault, 0); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CFStringAppendFormat(result, NULL, CFSTR("{wakeup port = 0x%x, stopped = %s, ignoreWakeUps = %s, \ncurrent mode = %@,\n"), cf, CFGetAllocator(cf), rl->_wakeUpPort, __CFRunLoopIsStopped(rl) ? "true" : "false", __CFRunLoopIsIgnoringWakeUps(rl) ? "true" : "false", rl->_currentMode ? rl->_currentMode->_name : CFSTR("(none)")); #else CFStringAppendFormat(result, NULL, CFSTR("{wakeup port = 0x%x, stopped = %s, ignoreWakeUps = %s, \ncurrent mode = %@,\n"), cf, CFGetAllocator(cf), rl->_wakeUpPort, __CFRunLoopIsStopped(rl) ? "true" : "false", __CFRunLoopIsIgnoringWakeUps(rl) ? "true" : "false", rl->_currentMode ? rl->_currentMode->_name : CFSTR("(none)")); @@ -956,7 +956,7 @@ static CFRunLoopModeRef __CFRunLoopFindMode(CFRunLoopRef rl, CFStringRef modeNam ret = __CFPortSetInsert(rl->_wakeUpPort, rlm->_portSet); if (KERN_SUCCESS != ret) CRASH("*** Unable to insert wake up port into port set. (%d) ***", ret); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 rlm->_msgQMask = 0; rlm->_msgPump = NULL; #endif @@ -971,7 +971,7 @@ static CFRunLoopModeRef __CFRunLoopFindMode(CFRunLoopRef rl, CFStringRef modeNam static Boolean __CFRunLoopModeIsEmpty(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFRunLoopModeRef previousMode) { CHECK_FOR_FORK(); if (NULL == rlm) return true; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (0 != rlm->_msgQMask) return false; #endif #if __HAS_DISPATCH__ @@ -996,7 +996,7 @@ static Boolean __CFRunLoopModeIsEmpty(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFR return true; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 uint32_t _CFRunLoopGetWindowsMessageQueueMask(CFRunLoopRef rl, CFStringRef modeName) { if (modeName == kCFRunLoopCommonModes) { @@ -1471,7 +1471,7 @@ static CFRunLoopRef __CFRunLoopCreate(_CFThreadRef t) { loop->_pthread = t; loop->_fromTSD = 0; loop->_timerTSRLock = CFLockInit; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 loop->_winthread = GetCurrentThreadId(); #else loop->_winthread = 0; @@ -2598,7 +2598,7 @@ static Boolean __CFRunLoopServiceFileDescriptors(__CFPortSet portSet, __CFPort o return true; } -#elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN +#elif TARGET_OS_WIN32 || TARGET_OS_CYGWIN #define TIMEOUT_INFINITY INFINITE @@ -2750,7 +2750,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #if TARGET_OS_MAC mach_msg_header_t *msg = NULL; mach_port_t livePort = MACH_PORT_NULL; -#elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN +#elif TARGET_OS_WIN32 || TARGET_OS_CYGWIN HANDLE livePort = NULL; Boolean windowsMessageReceived = false; #elif TARGET_OS_LINUX @@ -2788,7 +2788,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter if (__CFRunLoopServiceFileDescriptors(CFPORTSET_NULL, dispatchPort, 0, &livePort)) { goto handle_msg; } -#elif DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_CYGWIN +#elif TARGET_OS_WIN32 || TARGET_OS_CYGWIN if (__CFRunLoopWaitForMultipleObjects(NULL, &dispatchPort, 0, 0, &livePort, NULL)) { goto handle_msg; } @@ -2842,7 +2842,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter #endif -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 // Here, use the app-supplied message queue mask. They will set this if they are interested in having this run loop receive windows messages. __CFRunLoopWaitForMultipleObjects(waitSet, NULL, poll ? 0 : TIMEOUT_INFINITY, rlm->_msgQMask, &livePort, &windowsMessageReceived); #elif TARGET_OS_LINUX @@ -2871,7 +2871,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter handle_msg:; __CFRunLoopSetIgnoreWakeUps(rl); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (windowsMessageReceived) { // These Win32 APIs cause a callout, so make sure we're unlocked first and relocked after __CFRunLoopModeUnlock(rlm); @@ -2916,7 +2916,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter CFRUNLOOP_WAKEUP_FOR_WAKEUP(); cf_trace(KDEBUG_EVENT_CFRL_WAKEUP_FOR_WAKEUP, rl, rlm, livePort, 0); // do nothing on Mac OS -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // Always reset the wake up port, or risk spinning forever ResetEvent(rl->_wakeUpPort); #endif @@ -2952,7 +2952,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter __CFRunLoopModeUnlock(rlm); __CFRunLoopUnlock(rl); _CFSetTSD(__CFTSDKeyIsInGCDMainQ, (void *)6, NULL); -#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_WIN32 || TARGET_OS_LINUX void *msg = 0; #endif cf_trace(KDEBUG_EVENT_CFRL_IS_CALLING_DISPATCH | DBG_FUNC_START, rl, rlm, msg, livePort); @@ -2981,7 +2981,7 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter (void)mach_msg(reply, MACH_SEND_MSG, reply->msgh_size, 0, MACH_PORT_NULL, 0, MACH_PORT_NULL); CFAllocatorDeallocate(kCFAllocatorSystemDefault, reply); } -#elif DEPLOYMENT_TARGET_WINDOWS || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) +#elif TARGET_OS_WIN32 || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) sourceHandledThisLoop = __CFRunLoopDoSource1(rl, rlm, rls) || sourceHandledThisLoop; #endif } else { @@ -3128,7 +3128,7 @@ void CFRunLoopWakeUp(CFRunLoopRef rl) { } while (ret == -1 && errno == EINTR); CFAssert1(0 == ret, __kCFLogAssertion, "%s(): Unable to send wake message to eventfd", __PRETTY_FUNCTION__); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 SetEvent(rl->_wakeUpPort); #endif __CFRunLoopUnlock(rl); @@ -3715,7 +3715,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL } if (NULL == contextDesc) { void *addr = rls->_context.version0.version == 0 ? (void *)rls->_context.version0.perform : (rls->_context.version0.version == 1 ? (void *)rls->_context.version1.perform : NULL); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %p}"), rls->_context.version0.version, rls->_context.version0.info, addr); #elif TARGET_OS_MAC || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) Dl_info info; @@ -3723,7 +3723,7 @@ static CFStringRef __CFRunLoopSourceCopyDescription(CFTypeRef cf) { /* DOES CALL contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{version = %ld, info = %p, callout = %s (%p)}"), rls->_context.version0.version, rls->_context.version0.info, name, addr); #endif } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{signalled = %s, valid = %s, order = %d, context = %@}"), cf, CFGetAllocator(rls), __CFRunLoopSourceIsSignaled(rls) ? "Yes" : "No", __CFIsValid(rls) ? "Yes" : "No", rls->_order, contextDesc); #else result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{signalled = %s, valid = %s, order = %ld, context = %@}"), cf, CFGetAllocator(rls), __CFRunLoopSourceIsSignaled(rls) ? "Yes" : "No", __CFIsValid(rls) ? "Yes" : "No", (unsigned long)rls->_order, contextDesc); @@ -3914,7 +3914,7 @@ static CFStringRef __CFRunLoopObserverCopyDescription(CFTypeRef cf) { /* DOES CA if (!contextDesc) { contextDesc = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR(""), rlo->_context.info); } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 result = CFStringCreateWithFormat(kCFAllocatorSystemDefault, NULL, CFSTR("{valid = %s, activities = 0x%x, repeats = %s, order = %d, callout = %p, context = %@}"), cf, CFGetAllocator(rlo), __CFIsValid(rlo) ? "Yes" : "No", rlo->_activities, __CFRunLoopObserverRepeats(rlo) ? "Yes" : "No", rlo->_order, rlo->_callout, contextDesc); #elif TARGET_OS_MAC || (TARGET_OS_LINUX && !TARGET_OS_CYGWIN) void *addr = rlo->_callout; diff --git a/CoreFoundation/RunLoop.subproj/CFSocket.c b/CoreFoundation/RunLoop.subproj/CFSocket.c index 41cac4a837..727195a5c1 100644 --- a/CoreFoundation/RunLoop.subproj/CFSocket.c +++ b/CoreFoundation/RunLoop.subproj/CFSocket.c @@ -951,7 +951,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #else #include #endif -#if !DEPLOYMENT_TARGET_WINDOWS +#if !TARGET_OS_WIN32 #include #endif #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) @@ -966,7 +966,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #include #include "CFInternal.h" #include "CFRuntime_Internal.h" -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #endif @@ -974,7 +974,7 @@ Boolean __CFSocketGetBytesAvailable(CFSocketRef s, CFIndex* ctBytesAvailable) { #define NBBY 8 #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // redefine this to the winsock error in this file #undef EINPROGRESS @@ -1013,7 +1013,7 @@ static void timeradd(struct timeval *a, struct timeval *b, struct timeval *res) } } -#endif // DEPLOYMENT_TARGET_WINDOWS +#endif // TARGET_OS_WIN32 // On Mach we use a v0 RunLoopSource to make client callbacks. That source is signalled by a @@ -1034,7 +1034,7 @@ static _CFThreadRef __cfSocketTid() if (0 != pthread_threadid_np(NULL, &tid)) tid = pthread_mach_thread_np(pthread_self()); return (_CFThreadRef) tid; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 return (_CFThreadRef) GetCurrentThreadId(); #else return (_CFThreadRef) pthread_self(); @@ -1124,7 +1124,7 @@ static void __cfSocketLogWithSocket(CFSocketRef s, const char* function, int lin #endif CF_INLINE int __CFSocketLastError(void) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 return WSAGetLastError(); #else return thread_errno(); @@ -1317,7 +1317,7 @@ CF_INLINE void __CFSocketEstablishPeerAddress(CFSocketRef s) { static Boolean __CFNativeSocketIsValid(CFSocketNativeHandle sock) { Boolean result; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 SInt32 errorCode = 0; int errorSize = sizeof(errorCode); result = !(0 != getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)&errorCode, &errorSize) && __CFSocketLastError() == WSAENOTSOCK); @@ -1435,7 +1435,7 @@ CF_INLINE Boolean __CFSocketClearFDForWrite(CFSocketRef s) { return b; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 static Boolean WinSockUsed = FALSE; static void __CFSocketInitializeWinSock_Guts(void) { @@ -1481,7 +1481,7 @@ static void __CFSocketInitializeSockets(void) { __CFWriteSocketsFds = CFDataCreateMutable(kCFAllocatorSystemDefault, 0); __CFReadSocketsFds = CFDataCreateMutable(kCFAllocatorSystemDefault, 0); zeroLengthData = CFDataCreateMutable(kCFAllocatorSystemDefault, 0); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 __CFSocketInitializeWinSock_Guts(); #endif if (0 > __CFSocketCreateWakeupSocketPair()) { @@ -2248,7 +2248,7 @@ static void *__CFSocketManager(void * arg) __CFUnlock(&__CFActiveSocketsLock); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // On Windows, select checks connection failed sockets via the exceptfds parameter. connection succeeded is checked via writefds. We need both. exceptfds = writefds; #elif defined(LOG_CFSOCKET) && defined(DEBUG_POLLING_SELECT) @@ -2528,7 +2528,7 @@ CFTypeID CFSocketGetTypeID(void) { return _kCFRuntimeIDCFSocket; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 struct _args { void *func; void *arg; @@ -2628,7 +2628,7 @@ static CFSocketRef _CFSocketCreateWithNative(CFAllocatorRef allocator, CFSocketN pthread_attr_destroy(&attr); _Static_assert(sizeof(_CFThreadRef) == sizeof(void *), "_CFThreadRef is not pointer sized"); __CFSocketManagerThread = (void *)tid; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 unsigned tid; struct _args *args = (struct _args*)CFAllocatorAllocate(kCFAllocatorSystemDefault, sizeof(struct _args), 0); if (__CFOASafe) __CFSetLastAllocationEventName(args, "CFUtilities (thread-args)"); @@ -3336,7 +3336,7 @@ CFSocketError CFSocketConnectToAddress(CFSocketRef s, CFDataRef address, CFTimeI result = connect(sock, (struct sockaddr *)name, namelen); if (result != 0) { connect_err = __CFSocketLastError(); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 if (connect_err == WSAEWOULDBLOCK) connect_err = EINPROGRESS; #endif } @@ -3386,7 +3386,7 @@ CFSocketRef CFSocketCreate(CFAllocatorRef allocator, SInt32 protocolFamily, SInt #if TARGET_OS_MAC if (PF_LOCAL == protocolFamily && 0 >= socketType) socketType = SOCK_STREAM; #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // make sure we've called proper Win32 startup facilities before socket() __CFSocketInitializeWinSock(); #endif diff --git a/CoreFoundation/Stream.subproj/CFConcreteStreams.c b/CoreFoundation/Stream.subproj/CFConcreteStreams.c index 2977cc0c82..6301cff34a 100644 --- a/CoreFoundation/Stream.subproj/CFConcreteStreams.c +++ b/CoreFoundation/Stream.subproj/CFConcreteStreams.c @@ -96,7 +96,7 @@ static void constructCFFD(_CFFileStreamContext *fileStream, Boolean forRead, str static Boolean constructFD(_CFFileStreamContext *fileStream, CFStreamError *error, Boolean forRead, struct _CFStream *stream) { int flags = forRead ? O_RDONLY : (O_CREAT | O_TRUNC | O_WRONLY); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 wchar_t path[CFMaxPathSize]; flags |= (_O_BINARY|_O_NOINHERIT); if (_CFURLGetWideFileSystemRepresentation(fileStream->url, TRUE, path, CFMaxPathSize) == FALSE) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 87e44b7d3b..0c8e02eb53 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -47,7 +47,7 @@ CONST_STRING_DECL(kCFStreamSocketSecurityLevelNegotiatedSSL, "kCFStreamSocketSec #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 typedef void (*CF_SOCKET_STREAM_PAIR)(CFAllocatorRef, CFStringRef, UInt32, CFSocketNativeHandle, const CFSocketSignature*, CFReadStreamRef*, CFWriteStreamRef*); #endif @@ -90,7 +90,7 @@ enum { static struct { CFLock_t lock; UInt32 flags; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HMODULE image; #endif void (*_CFSocketStreamCreatePair)(CFAllocatorRef, CFStringRef, UInt32, CFSocketNativeHandle, const CFSocketSignature*, CFReadStreamRef*, CFWriteStreamRef*); @@ -99,7 +99,7 @@ static struct { } CFNetworkSupport = { CFLockInit, 0x0, -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 NULL, #endif NULL, @@ -111,7 +111,7 @@ static struct { #if TARGET_OS_MAC #define CFNETWORK_LOAD_SYM(sym) __CFLookupCFNetworkFunction(#sym) -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define CFNETWORK_LOAD_SYM(sym) (void *)GetProcAddress(CFNetworkSupport.image, #sym) #endif @@ -122,7 +122,7 @@ static void initializeCFNetworkSupport(void) { CFNetworkSupport._CFSocketStreamCreatePair = CFNETWORK_LOAD_SYM(_CFSocketStreamCreatePair); CFNetworkSupport._CFErrorCreateWithStreamError = CFNETWORK_LOAD_SYM(_CFErrorCreateWithStreamError); CFNetworkSupport._CFStreamErrorFromCFError = CFNETWORK_LOAD_SYM(_CFStreamErrorFromCFError); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 if (!CFNetworkSupport.image) { #if _DEBUG CFNetworkSupport.image = GetModuleHandleW(L"CFNetwork_debug.dll"); diff --git a/CoreFoundation/Stream.subproj/CFStream.c b/CoreFoundation/Stream.subproj/CFStream.c index a5950d2a79..163ea1b26b 100644 --- a/CoreFoundation/Stream.subproj/CFStream.c +++ b/CoreFoundation/Stream.subproj/CFStream.c @@ -15,7 +15,7 @@ #include "CFInternal.h" #include "CFRuntime_Internal.h" #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #endif @@ -973,7 +973,7 @@ CF_PRIVATE Boolean _CFStreamOpen(struct _CFStream *stream) { } _CFStreamScheduleEvent(stream, kCFStreamEventOpenCompleted); } else { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 _CFStreamClose(stream); #endif _CFStreamSetStatusCode(stream, kCFStreamStatusError); @@ -1732,7 +1732,7 @@ static CFRunLoopRef _legacyStreamRunLoop() if (sLegacyRL == NULL) { dispatch_semaphore_t sem = dispatch_semaphore_create(0); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HANDLE hThread = (HANDLE)_beginthreadex(NULL, 0, (_beginthreadex_proc_type)_legacyStreamRunLoop_workThread, @@ -1908,7 +1908,7 @@ CF_EXPORT CFIndex _CFStreamInstanceSize(void) { return sizeof(struct _CFStream); } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 void __CFStreamCleanup(void) { __CFLock(&sSourceLock); if (sSharedSources) { diff --git a/CoreFoundation/String.subproj/CFBurstTrie.c b/CoreFoundation/String.subproj/CFBurstTrie.c index 184efae961..1e9bfd2d01 100644 --- a/CoreFoundation/String.subproj/CFBurstTrie.c +++ b/CoreFoundation/String.subproj/CFBurstTrie.c @@ -27,7 +27,7 @@ #include #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define open _NS_open #define statinfo _stat #define stat(x,y) _NS_stat(x,y) @@ -248,7 +248,7 @@ struct _CFBurstTrie { uint32_t count; uint32_t containerSize; int retain; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HANDLE mapHandle; HANDLE mappedFileHandle; #endif @@ -353,7 +353,7 @@ CFBurstTrieRef CFBurstTrieCreateFromFile(CFStringRef path) { /* Check if file can be opened */ if ((fd = open(filename, CF_OPENFLGS|O_RDONLY, 0)) < 0) return NULL; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HANDLE mappedFileHandle = (HANDLE)_get_osfhandle(fd); if (!mappedFileHandle) return NULL; @@ -377,7 +377,7 @@ CFBurstTrieRef CFBurstTrieCreateFromFile(CFStringRef path) { trie->cflags = CFSwapInt32LittleToHost(((fileHeader*)trie->mapBase)->flags); trie->count = CFSwapInt32LittleToHost(((fileHeader*)trie->mapBase)->count); trie->retain = 1; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 trie->mappedFileHandle = mappedFileHandle; trie->mapHandle = mapHandle; #else @@ -391,7 +391,7 @@ CFBurstTrieRef CFBurstTrieCreateFromFile(CFStringRef path) { trie->cflags = CFSwapInt32LittleToHost(header->flags); trie->count = CFSwapInt32LittleToHost(header->count); trie->retain = 1; -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 trie->mappedFileHandle = mappedFileHandle; trie->mapHandle = mapHandle; #else @@ -635,7 +635,7 @@ Boolean CFBurstTrieSerializeWithFileDescriptor(CFBurstTrieRef trie, int fd, CFBu trie->cflags = opts; trie->mapSize = serializeCFBurstTrie(trie, start_offset, fd); -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HANDLE mappedFileHandle = (HANDLE)_get_osfhandle(fd); // We need to make sure we have our own handle to keep this file open as long as the mmap lasts DuplicateHandle(GetCurrentProcess(), mappedFileHandle, GetCurrentProcess(), &mappedFileHandle, 0, 0, DUPLICATE_SAME_ACCESS); @@ -1972,7 +1972,7 @@ static size_t serializeCFBurstTrie(CFBurstTrieRef trie, size_t start_offset, int static void destroyCFBurstTrie(CFBurstTrieRef trie) { if (trie->mapBase) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 UnmapViewOfFile(trie->mapBase); CloseHandle(trie->mapHandle); CloseHandle(trie->mappedFileHandle); diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c index cbccf658b7..56d3661a37 100644 --- a/CoreFoundation/String.subproj/CFString.c +++ b/CoreFoundation/String.subproj/CFString.c @@ -27,7 +27,7 @@ #include "CFString_Internal.h" #include "CFRuntime_Internal.h" #include -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX #include "CFLocaleInternal.h" #include "CFStringLocalizedFormattingInternal.h" #endif @@ -418,7 +418,7 @@ CFStringEncoding __CFDefaultEightBitStringEncoding = kCFStringEncodingInvalidId; #define __defaultEncoding kCFStringEncodingMacRoman #elif TARGET_OS_LINUX #define __defaultEncoding kCFStringEncodingUTF8 -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define __defaultEncoding kCFStringEncodingWindowsLatin1 #else #warning This value must match __CFGetConverter condition in CFStringEncodingConverter.c @@ -443,7 +443,7 @@ CF_INLINE CFStringEncoding __CFStringGetSystemEncoding(void) { CFStringEncoding CFStringFileSystemEncoding(void) { if (__CFDefaultFileSystemEncoding == kCFStringEncodingInvalidId) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 __CFDefaultFileSystemEncoding = kCFStringEncodingUTF8; #else __CFDefaultFileSystemEncoding = CFStringGetSystemEncoding(); @@ -1867,7 +1867,7 @@ static Boolean __CFStrIsConstantString(CFStringRef str) { #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 void __CFStringCleanup (void) { /* in case library is unloaded, release store for the constant string table */ if (constantStringTable != NULL) { @@ -6740,7 +6740,7 @@ static CFIndex __CFStringValidateFormat(CFStringRef expected, CFStringRef untrus if (!verified) { if (errorPtr) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_WIN32 CFStringRef debugMsg = CFStringCreateWithFormat(tmpAlloc, NULL, CFSTR("Format '%@' does not match expected '%@'"), untrustedFormat, expected); CFMutableDictionaryRef userInfo = CFDictionaryCreateMutable(tmpAlloc, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(userInfo, kCFErrorDebugDescriptionKey, debugMsg); @@ -7186,7 +7186,7 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr } // See if we need to localize the decimal point if (formatOptions) { // We have localization info -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFStringRef decimalSeparator = (CFGetTypeID(formatOptions) == CFLocaleGetTypeID()) ? (CFStringRef)CFLocaleGetValue((CFLocaleRef)formatOptions, kCFLocaleDecimalSeparatorKey) : (CFStringRef)CFDictionaryGetValue(formatOptions, CFSTR("NSDecimalSeparator")); #else CFStringRef decimalSeparator = CFSTR("."); diff --git a/CoreFoundation/String.subproj/CFStringUtilities.c b/CoreFoundation/String.subproj/CFStringUtilities.c index af19e00bb6..f5ad6b1e88 100644 --- a/CoreFoundation/String.subproj/CFStringUtilities.c +++ b/CoreFoundation/String.subproj/CFStringUtilities.c @@ -17,13 +17,13 @@ #include "CFICUConverters.h" #include #include -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX #include #include #endif #include -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #include #endif @@ -110,7 +110,7 @@ CFStringEncoding CFStringConvertIANACharSetNameToEncoding(CFStringRef charsetNam encoding = __CFStringEncodingGetFromCanonicalName(name); -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (kCFStringEncodingInvalidId == encoding) encoding = __CFStringEncodingGetFromICUName(name); #endif @@ -258,7 +258,7 @@ CFStringEncoding CFStringGetMostCompatibleMacStringEncoding(CFStringEncoding enc #define kCFStringCompareAllocationIncrement (128) -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX // ------------------------------------------------------------------------------------------------- // CompareSpecials - ignore case & diacritic differences @@ -526,7 +526,7 @@ static OSStatus __CompareTextDefault(UCollator *collator, CFOptionFlags options, return 0; // noErr } -#endif // TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#endif // TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static inline CFIndex __extendLocationBackward(CFIndex location, CFStringInlineBuffer *str, const uint8_t *nonBaseBMP, const uint8_t *punctBMP) { while (location > 0) { @@ -570,7 +570,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * CFRange range1 = str1Range; CFRange range2 = str2Range; SInt32 order; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX Boolean isEqual; bool forcedOrdering = ((options & kCFCompareForcedOrdering) ? true : false); @@ -604,7 +604,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range2.location = __extendLocationBackward(range2.location - 1, str2, nonBaseBMP, punctBMP); } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX #if TARGET_OS_MAC // First we try to use the last one used on this thread, if the locale is the same, // otherwise we try to check out a default one, or then we create one. @@ -632,7 +632,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * range1.length = (str1Range.location + str1Range.length) - range1.location; range2.length = (str2Range.location + str2Range.length) - range2.location; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { compResult = ((isEqual && !forcedOrdering) ? kCFCompareEqualTo : ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan)); } else @@ -702,7 +702,7 @@ CF_PRIVATE CFComparisonResult _CFCompareStringsWithLocale(CFStringInlineBuffer * } } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if ((NULL != collator) && (__CompareTextDefault(collator, options, characters1, range1.length, characters2, range2.length, &isEqual, &order) == 0 /* noErr */)) { if (isEqual) { if (forcedOrdering && (kCFCompareEqualTo == compResult) && (0 != order)) compResult = ((order < 0) ? kCFCompareLessThan : kCFCompareGreaterThan); diff --git a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c index a09dd45ad4..e9a0f525fe 100644 --- a/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c +++ b/CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c @@ -20,14 +20,14 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 return (IsValidCodePage(CFStringConvertEncodingToWindowsCodepage(encoding)) ? true : false); #else return false; #endif } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX static const CFStringEncodingConverter __CFICUBootstrap = { .toBytes.standard = NULL, @@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert if (__CFIsPlatformConverterAvailable(encoding)) { return &__CFPlatformBootstrap; } else { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (__CFStringEncodingGetICUName(encoding)) { return &__CFICUBootstrap; } @@ -79,7 +79,7 @@ CF_PRIVATE CFStringEncoding *__CFStringEncodingCreateListOfAvailablePlatformConv return NULL; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #include @@ -122,7 +122,7 @@ CF_PRIVATE CFStringEncoding *__CFStringEncodingCreateListOfAvailablePlatformConv CF_PRIVATE CFIndex __CFStringEncodingPlatformUnicodeToBytes(uint32_t encoding, uint32_t flags, const UniChar *characters, CFIndex numChars, CFIndex *usedCharLen, uint8_t *bytes, CFIndex maxByteLen, CFIndex *usedByteLen) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 WORD dwFlags = 0; CFIndex usedLen; @@ -166,14 +166,14 @@ CF_PRIVATE CFIndex __CFStringEncodingPlatformUnicodeToBytes(uint32_t encoding, u if (usedByteLen) *usedByteLen = usedLen; return kCFStringEncodingConversionSuccess; } -#endif /* DEPLOYMENT_TARGET_WINDOWS */ +#endif /* TARGET_OS_WIN32 */ return kCFStringEncodingConverterUnavailable; } CF_PRIVATE CFIndex __CFStringEncodingPlatformBytesToUnicode(uint32_t encoding, uint32_t flags, const uint8_t *bytes, CFIndex numBytes, CFIndex *usedByteLen, UniChar *characters, CFIndex maxCharLen, CFIndex *usedCharLen) { -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 WORD dwFlags = 0; CFIndex usedLen; @@ -211,7 +211,7 @@ CF_PRIVATE CFIndex __CFStringEncodingPlatformBytesToUnicode(uint32_t encoding, u if (usedByteLen) *usedByteLen = numBytes; return kCFStringEncodingConversionSuccess; } -#endif /* DEPLOYMENT_TARGET_WINDOWS */ +#endif /* TARGET_OS_WIN32 */ return kCFStringEncodingConverterUnavailable; } diff --git a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c index ce81250c1e..d2c615a005 100644 --- a/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c +++ b/CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c @@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper; break; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX case kCFStringEncodingConverterICU: converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding); break; @@ -601,7 +601,7 @@ static const _CFEncodingConverter *__CFGetConverter(uint32_t encoding) { /* the swith here should avoid possible bootstrap issues in the default: case below when invoked from CFStringGetSystemEncoding() */ #if TARGET_OS_MAC || TARGET_OS_LINUX case kCFStringEncodingMacRoman: commonConverterSlot = (const _CFEncodingConverter **)&(commonConverters[1]); break; -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 case kCFStringEncodingWindowsLatin1: commonConverterSlot = (const _CFEncodingConverter **)(&(commonConverters[1])); break; #else #warning This case must match __defaultEncoding value defined in CFString.c @@ -696,7 +696,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const } } -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen); #endif @@ -825,7 +825,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const if (!converter) return kCFStringEncodingConverterUnavailable; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen); #endif @@ -869,7 +869,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_ const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes); #endif @@ -913,7 +913,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui const _CFEncodingConverter *converter = __CFGetConverter(encoding); if (converter) { -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars); #endif @@ -998,7 +998,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void if (NULL == encodings) { CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings; CFIndex numICUConverters = 0, numPlatformConverters = 0; -#if TARGET_OS_MAC || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX +#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters); #else CFStringEncoding *icuConverters = NULL; diff --git a/CoreFoundation/StringEncodings.subproj/CFUniChar.c b/CoreFoundation/StringEncodings.subproj/CFUniChar.c index 3e2db59edd..63102e2519 100644 --- a/CoreFoundation/StringEncodings.subproj/CFUniChar.c +++ b/CoreFoundation/StringEncodings.subproj/CFUniChar.c @@ -28,7 +28,7 @@ #include #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #endif @@ -36,13 +36,13 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength); #define __kCFCharacterSetDir "/System/Library/CoreServices" #elif TARGET_OS_LINUX || TARGET_OS_BSD #define __kCFCharacterSetDir "/usr/local/share/CoreFoundation" -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define __kCFCharacterSetDir "\\Windows\\CoreFoundation" #endif #if TARGET_OS_MAC #define USE_MACHO_SEGMENT 1 -#elif DEPLOYMENT_RUNTIME_SWIFT && (TARGET_OS_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_WINDOWS) +#elif DEPLOYMENT_RUNTIME_SWIFT && (TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WIN32) #define USE_RAW_SYMBOL 1 #endif @@ -109,7 +109,7 @@ static const void *__CFGetSectDataPtr(const char *segname, const char *sectname, #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) { -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #else #error Unknown or unspecified DEPLOYMENT_TARGET @@ -118,7 +118,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); #elif TARGET_OS_LINUX || TARGET_OS_BSD strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN); -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 wchar_t frameworkPath[MAXPATHLEN]; _CFGetFrameworkPath(frameworkPath, MAXPATHLEN); wcsncpy(wpath, frameworkPath, MAXPATHLEN); @@ -129,7 +129,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) { #endif } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 #define MAX_BITMAP_STATE 512 // // If a string is placed into this array, then it has been previously @@ -173,12 +173,12 @@ void __AddBitmapStateForName(const wchar_t *bitmapName) { #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes, int64_t *fileSize) { -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **bytes, int64_t *fileSize) { #else #error Unknown or unspecified DEPLOYMENT_TARGET #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 HANDLE bitmapFileHandle = NULL; HANDLE mappingHandle = NULL; @@ -246,7 +246,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define CF_UNICHAR_BITMAP_FILE "/CFCharacterSetBitmaps.bitmap" #endif #endif -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #if !defined(CF_UNICHAR_BITMAP_FILE) #define CF_UNICHAR_BITMAP_FILE L"CFCharacterSetBitmaps.bitmap" #endif @@ -268,7 +268,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #define MAPPING_TABLE_FILE "/CFUnicodeData-L.mapping" #endif #endif -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #if __CF_BIG_ENDIAN__ #if USE_MACHO_SEGMENT #define MAPPING_TABLE_FILE "__data" @@ -292,7 +292,7 @@ static bool __CFUniCharLoadBytesFromFile(const wchar_t *fileName, const void **b #else #define PROP_DB_FILE "/CFUniCharPropertyDatabase.data" #endif -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #if USE_MACHO_SEGMENT #define PROP_DB_FILE "__properties" #else @@ -343,7 +343,7 @@ static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes, int6 return result; #endif } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 static bool __CFUniCharLoadFile(const wchar_t *bitmapName, const void **bytes, int64_t *fileSize) { #if USE_RAW_SYMBOL extern void *__CFCharacterSetBitmapData; diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c index 0044664a90..49f9159643 100644 --- a/CoreFoundation/URL.subproj/CFURL.c +++ b/CoreFoundation/URL.subproj/CFURL.c @@ -1957,7 +1957,7 @@ static Boolean _CFStringIsLegalURLString(CFStringRef string) { break; } } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // CF on Windows: CFURLCreateWithString should work with | in path on Windows if ( isURLLegalCharacter(*chPtr) || *chPtr == '|' ) { continue; @@ -2324,7 +2324,7 @@ static CFURLRef _CFURLCreateWithFileSystemRepresentation(CFAllocatorRef allocato if ( releaseBaseURL && baseURL ) { CFRelease(baseURL); } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 CFStringRef filePath = CFStringCreateWithBytes(allocator, buffer, bufLen, CFStringFileSystemEncoding(), false); if ( filePath ) { result = (struct __CFURL *)_CFURLCreateWithFileSystemPath(allocator, filePath, kCFURLWindowsPathStyle, isDirectory, baseURL); @@ -4188,7 +4188,7 @@ static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str, } #endif -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 // From CFPlatform.c extern CFStringRef CFCreateWindowsDrivePathFromVolumeName(CFStringRef volNameStr); #endif @@ -4228,7 +4228,7 @@ static CFStringRef URLPathToWindowsPath(CFStringRef path, CFAllocatorRef allocat CFRelease(driveStr); } } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 else { // From [DEFECT] CFURL returns a Windows path that contains volume name instead of a drive letter // we need to replace the volume name (it is not valid on Windows) with the drive mounting point path @@ -4515,7 +4515,7 @@ CFStringRef CFURLCreateStringWithFileSystemPath(CFAllocatorRef allocator, CFURLR } Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, uint8_t *buffer, CFIndex bufLen) { -#if TARGET_OS_MAC || TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_WIN32 CFAllocatorRef alloc = CFGetAllocator(url); CFStringRef path; @@ -4537,7 +4537,7 @@ Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBas CFRelease(path); return convResult; } -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 path = CFURLCreateStringWithFileSystemPath(alloc, url, kCFURLWindowsPathStyle, resolveAgainstBase); if (path) { CFIndex usedLen; @@ -4553,7 +4553,7 @@ Boolean CFURLGetFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBas return false; } -#if DEPLOYMENT_TARGET_WINDOWS +#if TARGET_OS_WIN32 CF_EXPORT Boolean _CFURLGetWideFileSystemRepresentation(CFURLRef url, Boolean resolveAgainstBase, wchar_t *buffer, CFIndex bufferLength) { CFStringRef path = CFURLCreateStringWithFileSystemPath(CFGetAllocator(url), url, kCFURLWindowsPathStyle, resolveAgainstBase); CFIndex pathLength, charsConverted, usedBufLen; diff --git a/CoreFoundation/URL.subproj/CFURL.inc.h b/CoreFoundation/URL.subproj/CFURL.inc.h index bfd3103e9c..490d1f1b9c 100644 --- a/CoreFoundation/URL.subproj/CFURL.inc.h +++ b/CoreFoundation/URL.subproj/CFURL.inc.h @@ -250,7 +250,7 @@ } else if (!sawPercent) { flags |= POSIX_AND_URL_PATHS_MATCH; } -#elif TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_LINUX || TARGET_OS_WIN32 if (!sawPercent) { flags |= POSIX_AND_URL_PATHS_MATCH; } diff --git a/CoreFoundation/URL.subproj/CFURLAccess.c b/CoreFoundation/URL.subproj/CFURLAccess.c index fd329499e5..2cb4189f1b 100644 --- a/CoreFoundation/URL.subproj/CFURLAccess.c +++ b/CoreFoundation/URL.subproj/CFURLAccess.c @@ -32,7 +32,7 @@ CFData read/write routines #include #include #include -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #include #include #include @@ -235,7 +235,7 @@ static Boolean _CFFileURLWritePropertiesToResource(CFURLRef url, CFDictionaryRef } else { #if TARGET_OS_OSX || TARGET_OS_IOS || TARGET_OS_LINUX || TARGET_OS_BSD #define MODE_TYPE mode_t -#elif DEPLOYMENT_TARGET_WINDOWS +#elif TARGET_OS_WIN32 #define MODE_TYPE uint16_t #else #error Unknown or unspecified DEPLOYMENT_TARGET From 4a475074d90a74339572eb2f75cbaa8fe131075d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 12:53:24 -0700 Subject: [PATCH 09/10] DEPLOYMENT_TARGET_ANDROID -> TARGET_OS_ANDROID --- CoreFoundation/Base.subproj/CFInternal.h | 2 +- CoreFoundation/Base.subproj/CFKnownLocations.c | 2 +- CoreFoundation/Base.subproj/CFPlatform.c | 2 +- CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h | 2 +- CoreFoundation/PlugIn.subproj/CFBundle.c | 2 +- CoreFoundation/PlugIn.subproj/CFBundle_Executable.c | 12 ++++++------ build-android | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h index c395bb590e..ebb86e1de0 100644 --- a/CoreFoundation/Base.subproj/CFInternal.h +++ b/CoreFoundation/Base.subproj/CFInternal.h @@ -229,7 +229,7 @@ extern void __CFGenericValidateType_(CFTypeRef cf, CFTypeID type, const char *fu #define __CFBitfield64GetValue(V, N1, N2) (((V) & __CFBitfield64Mask(N1, N2)) >> (N2)) #define __CFBitfield64SetValue(V, N1, N2, X) ((V) = ((V) & ~__CFBitfield64Mask(N1, N2)) | ((((uint64_t)X) << (N2)) & __CFBitfield64Mask(N1, N2))) -#if TARGET_RT_64_BIT || DEPLOYMENT_TARGET_ANDROID +#if TARGET_RT_64_BIT || TARGET_OS_ANDROID typedef uint64_t __CFInfoType; #define __CFInfoMask(N1, N2) __CFBitfield64Mask(N1, N2) #else diff --git a/CoreFoundation/Base.subproj/CFKnownLocations.c b/CoreFoundation/Base.subproj/CFKnownLocations.c index 81ad22ad97..1433c35619 100644 --- a/CoreFoundation/Base.subproj/CFKnownLocations.c +++ b/CoreFoundation/Base.subproj/CFKnownLocations.c @@ -45,7 +45,7 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUs } } -#elif !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#elif !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID /* Building for an OS that uses the FHS, BSD's hier(7), and/or the XDG specification for paths: diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index 776584dc85..8d65d07154 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -295,7 +295,7 @@ CF_EXPORT CFStringRef CFCopyUserName(void) { return result; } -#if DEPLOYMENT_TARGET_ANDROID +#if TARGET_OS_ANDROID #define pw_gecos pw_name #endif diff --git a/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h b/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h index 1c0ddba386..7d35b27c27 100644 --- a/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h +++ b/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h @@ -507,7 +507,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFOpenFile(const char *path, int opts); static inline int _direntNameLength(struct dirent *entry) { #ifdef _D_EXACT_NAMLEN // defined on Linux return _D_EXACT_NAMLEN(entry); -#elif DEPLOYMENT_TARGET_ANDROID +#elif TARGET_OS_ANDROID return strlen(entry->d_name); #else return entry->d_namlen; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/CoreFoundation/PlugIn.subproj/CFBundle.c index 9847c4216f..5484173306 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle.c @@ -163,7 +163,7 @@ static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) { #endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles() { -#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID return true; #else return false; diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c index f6ea2802f9..80ffa49349 100644 --- a/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c +++ b/CoreFoundation/PlugIn.subproj/CFBundle_Executable.c @@ -16,7 +16,7 @@ #include #endif -#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID #if TARGET_OS_LINUX #if TARGET_RT_64_BIT @@ -49,7 +49,7 @@ _kCFBundleFHSDirectory_lib #endif // TARGET_OS_LINUX -#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID // This is here because on iPhoneOS with the dyld shared cache, we remove binaries from their // original locations on disk, so checking whether a binary's path exists is no longer sufficient. @@ -200,7 +200,7 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL Boolean doExecSearch = true; #endif -#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID if (lookupMainExe && bundle && bundle->_isFHSInstalledBundle) { // For a FHS installed bundle, the URL points to share/Bundle.resources, and the binary is in: @@ -224,13 +224,13 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL CFRelease(prefixPath); } -#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID // Now, look for the executable inside the bundle. if (!foundIt && doExecSearch && 0 != version) { CFURLRef exeDirURL = NULL; -#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID if (bundle && bundle->_isFHSInstalledBundle) { CFURLRef withoutExtension = CFURLCreateCopyDeletingPathExtension(kCFAllocatorSystemDefault, url); CFStringRef lastPathComponent = CFURLCopyLastPathComponent(withoutExtension); @@ -245,7 +245,7 @@ static CFURLRef _CFBundleCopyExecutableURLInDirectory2(CFBundleRef bundle, CFURL CFRelease(libexec); CFRelease(exeDirName); } else -#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !DEPLOYMENT_TARGET_ANDROID +#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID if (1 == version) { exeDirURL = CFURLCreateWithString(kCFAllocatorSystemDefault, _CFBundleExecutablesURLFromBase1, url); } else if (2 == version) { diff --git a/build-android b/build-android index 7eb6fff60e..15d21f7c67 100755 --- a/build-android +++ b/build-android @@ -107,8 +107,8 @@ if [ ! -f libFoundation.so ]; then BUILD_DIR="$SWIFT_ANDROID_BUILD_PATH/foundation-linux-x86_64" \ DSTROOT="/" \ PREFIX="/usr" \ - CFLAGS="-DDEPLOYMENT_TARGET_ANDROID -DDEPLOYMENT_ENABLE_LIBDISPATCH --sysroot=$ANDROID_NDK_PATH/platforms/android-21/arch-arm -I$ANDROID_ICU_PATH/armeabi-v7a/include -I${SDKROOT}/lib/swift -I$ANDROID_NDK_PATH/sources/android/support/include -I$ANDROID_STANDALONE_SYSROOT/usr/include -I$SWIFT_PATH/swift-corelibs-foundation/closure" \ - SWIFTCFLAGS="-DDEPLOYMENT_TARGET_ANDROID -DDEPLOYMENT_ENABLE_LIBDISPATCH -I$ANDROID_NDK_PATH/platforms/android-21/arch-arm/usr/include" \ + CFLAGS="-DDEPLOYMENT_ENABLE_LIBDISPATCH --sysroot=$ANDROID_NDK_PATH/platforms/android-21/arch-arm -I$ANDROID_ICU_PATH/armeabi-v7a/include -I${SDKROOT}/lib/swift -I$ANDROID_NDK_PATH/sources/android/support/include -I$ANDROID_STANDALONE_SYSROOT/usr/include -I$SWIFT_PATH/swift-corelibs-foundation/closure" \ + SWIFTCFLAGS="-DDEPLOYMENT_ENABLE_LIBDISPATCH -I$ANDROID_NDK_PATH/platforms/android-21/arch-arm/usr/include" \ LDFLAGS="-fuse-ld=gold --sysroot=$ANDROID_NDK_PATH/platforms/android-21/arch-arm -L$ANDROID_NDK_PATH/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x -L$ANDROID_ICU_PATH/armeabi-v7a -L$ANDROID_STANDALONE_SYSROOT/usr/lib -ldispatch " \ ./configure \ Release \ From b3821e461527b885a0d4c0e9eb993e355a54fd54 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 10 May 2019 13:51:05 -0700 Subject: [PATCH 10/10] DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE -> TARGET_OS_MAC --- CoreFoundation/RunLoop.subproj/CFRunLoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c index 0988fd21ca..a28bae8bfc 100644 --- a/CoreFoundation/RunLoop.subproj/CFRunLoop.c +++ b/CoreFoundation/RunLoop.subproj/CFRunLoop.c @@ -552,7 +552,7 @@ typedef struct UnsignedWide { typedef UnsignedWide AbsoluteTime; #endif -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC #if USE_DISPATCH_SOURCE_FOR_TIMERS #endif @@ -1951,7 +1951,7 @@ static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__(void (*pe } static void __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__( -#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE +#if TARGET_OS_MAC void *(*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info), mach_msg_header_t *msg, CFIndex size, mach_msg_header_t **reply, #else