Skip to content

Commit 867a4b2

Browse files
millenomimillenomi
committed
Some changes from Foundation team review. Details in a PR comment.
1 parent fb234f6 commit 867a4b2

File tree

25 files changed

+110
-116
lines changed

25 files changed

+110
-116
lines changed

‎CoreFoundation/Base.subproj/CFBase.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include <stdlib.h>
2323
#include <string.h>
2424

25-
#include "ForFoundationOnly.h"
26-
2725
// -------- -------- -------- -------- -------- -------- -------- --------
2826

2927
struct __CFAllocator {
@@ -746,8 +744,8 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context
746744

747745

748746

749-
static void __CFReallocationFailed(void *ptr, CFStringRef reason, void (^reallocationFailureHandler)(void *original, _Bool *outRecovered)) {
750-
_Bool recovered = false;
747+
static void __CFReallocationFailed(void *ptr, CFStringRef reason, void (^reallocationFailureHandler)(void *original, bool *outRecovered)) {
748+
bool recovered = false;
751749
if (reallocationFailureHandler) {
752750
reallocationFailureHandler(ptr, &recovered);
753751
}
@@ -759,7 +757,7 @@ static void __CFReallocationFailed(void *ptr, CFStringRef reason, void (^realloc
759757
}
760758

761759

762-
void *__CFSafelyReallocate(void *destination, size_t newCapacity, void (^reallocationFailureHandler)(void *original, _Bool *outRecovered)) {
760+
void *__CFSafelyReallocate(void *destination, size_t newCapacity, void (^reallocationFailureHandler)(void *original, bool *outRecovered)) {
763761
void *const reallocated = realloc(destination, newCapacity);
764762
if (__builtin_expect(reallocated == NULL, false)) {
765763
__CFReallocationFailed(destination, CFSTR("realloc"), reallocationFailureHandler);
@@ -768,7 +766,7 @@ void *__CFSafelyReallocate(void *destination, size_t newCapacity, void (^realloc
768766
}
769767

770768

771-
void *__CFSafelyReallocateWithAllocator(CFAllocatorRef allocator, void *destination, size_t newCapacity, CFOptionFlags options, void (^reallocationFailureHandler)(void *original, _Bool *outRecovered)) {
769+
void *__CFSafelyReallocateWithAllocator(CFAllocatorRef allocator, void *destination, size_t newCapacity, CFOptionFlags options, void (^reallocationFailureHandler)(void *original, bool *outRecovered)) {
772770
void *reallocated = CFAllocatorReallocate(allocator, destination, newCapacity, options);
773771
// NOTE: important difference in behavior between realloc vs CFAllocateReallocate NULL+0 -> NULL for allocators!
774772
if (__builtin_expect(reallocated == NULL, false) && !(destination == NULL && newCapacity == 0)) {

‎CoreFoundation/Base.subproj/CFInternal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ CF_EXTERN_C_BEGIN
9595
#include <stdatomic.h>
9696
#include <Block.h>
9797

98-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
98+
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
9999

100100
#if !TARGET_OS_CYGWIN && !defined(__linux__)
101101
#include <xlocale.h>
@@ -105,7 +105,7 @@ CF_EXTERN_C_BEGIN
105105
#include <sys/time.h>
106106
#include <signal.h>
107107
#include <stdio.h>
108-
#endif // DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
108+
#endif // TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
109109

110110
#include <pthread.h>
111111

‎CoreFoundation/Base.subproj/CFPlatform.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ CF_EXPORT CFStringRef CFCopyUserName(void) {
295295

296296
CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) {
297297
CFStringRef result = NULL;
298-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
298+
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
299299
uid_t euid;
300300
__CFGetUGIDs(&euid, NULL);
301301
struct passwd *upwd = getpwuid(euid ? euid : getuid());
@@ -312,7 +312,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) {
312312
return result;
313313
}
314314

315-
#if DEPLOYMENT_TARGET_ANDROID
315+
#if TARGET_OS_ANDROID
316316
#undef pw_gecos
317317
#endif
318318

‎CoreFoundation/Base.subproj/CFPriv.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,9 @@
2626
#include <CoreFoundation/CFSet.h>
2727
#include <math.h>
2828

29-
#ifndef CF_CROSS_PLATFORM_EXPORT
30-
#if !DEPLOYMENT_RUNTIME_OBJC
31-
#define CF_CROSS_PLATFORM_EXPORT extern
32-
#else
33-
#define CF_CROSS_PLATFORM_EXPORT static __attribute__((used))
34-
#endif
35-
#endif
29+
#define CF_CROSS_PLATFORM_EXPORT extern
3630

37-
#if DEPLOYMENT_TARGET_WINDOWS
31+
#if TARGET_OS_WIN32
3832
// No C99 support
3933
#define _CF_RESTRICT
4034
#else

‎CoreFoundation/Base.subproj/CFRuntime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ extern CFTypeID CFTreeGetTypeID(void);
960960
extern CFTypeID CFPlugInInstanceGetTypeID(void);
961961
extern CFTypeID CFStringTokenizerGetTypeID(void);
962962
extern CFTypeID CFStorageGetTypeID(void);
963-
#if DEPLOYMENT_TARGET_LINUX || (DEPLOYMENT_TARGET_MACOSX && DEPLOYMENT_RUNTIME_SWIFT)
963+
#if TARGET_OS_LINUX || (TARGET_OS_MAC && !DEPLOYMENT_RUNTIME_OBJC)
964964
CF_PRIVATE void __CFTSDInitialize(void);
965965
#endif
966966
#if DEPLOYMENT_TARGET_WINDOWS
@@ -1124,7 +1124,7 @@ void __CFInitialize(void) {
11241124
#if DEPLOYMENT_TARGET_WINDOWS
11251125
// Must not call any CF functions
11261126
__CFTSDWindowsInitialize();
1127-
#elif DEPLOYMENT_TARGET_LINUX || (DEPLOYMENT_TARGET_MACOSX && !DEPLOYMENT_RUNTIME_OBJC)
1127+
#elif TARGET_OS_LINUX || (TARGET_OS_MAC && !DEPLOYMENT_RUNTIME_OBJC)
11281128
__CFTSDInitialize();
11291129
#endif
11301130
__CFProphylacticAutofsAccess = true;

‎CoreFoundation/Base.subproj/CFSortFunctions.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include "CFInternal.h"
1313
#if __HAS_DISPATCH__
1414
#include <dispatch/dispatch.h>
15-
#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) && __has_include(<dispatch/private.h>)
15+
#if TARGET_OS_MAC && __has_include(<dispatch/private.h>)
1616
#include <dispatch/private.h>
1717
#else
1818
#define DISPATCH_APPLY_CURRENT_ROOT_QUEUE ((dispatch_queue_t _Nonnull)0)
19-
#endif // (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED) && __has_include(<dispatch/private.h>)
19+
#endif // TARGET_OS_MAC && __has_include(<dispatch/private.h>)
2020
#endif // __HAS_DISPATCH__
2121
#include "CFLogUtilities.h"
2222
#include "CFInternal.h"

‎CoreFoundation/Base.subproj/CFUtilities.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,13 +1513,13 @@ CFDictionaryRef __CFGetEnvironment() {
15131513
static dispatch_once_t once = 0L;
15141514
static CFMutableDictionaryRef envDict = NULL;
15151515
dispatch_once(&once, ^{
1516-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1516+
#if TARGET_OS_MAC
15171517
extern char ***_NSGetEnviron(void);
15181518
char **envp = *_NSGetEnviron();
1519-
#elif DEPLOYMENT_TARGET_FREEBSD || TARGET_OS_CYGWIN
1519+
#elif TARGET_OS_BSD || TARGET_OS_CYGWIN
15201520
extern char **environ;
15211521
char **envp = environ;
1522-
#elif DEPLOYMENT_TARGET_LINUX
1522+
#elif TARGET_OS_LINUX
15231523
#if !defined(environ) && !TARGET_OS_ANDROID
15241524
#define environ __environ
15251525
#endif

‎CoreFoundation/Base.subproj/CoreFoundation_Prefix.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
#define _DARWIN_UNLIMITED_SELECT 1
1414

15-
#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS)
15+
#include <CoreFoundation/CFAvailability.h>
16+
17+
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_WIN32
1618
#if DEPLOYMENT_RUNTIME_SWIFT
1719
#if DEPLOYMENT_ENABLE_LIBDISPATCH
1820
#define __HAS_DISPATCH__ 1

‎CoreFoundation/Base.subproj/ForFoundationOnly.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ CF_IMPLICIT_BRIDGING_DISABLED
6565
6666
The outRecovered BOOL can be used to control what happens after the handler is called. If left unset, and the reallocationFailureHandler does unwind-the-stack/abort, we use the standard CF out-of-memory flow. If set to YES, then __CFSafelyReallocate{,WithAllocator} will return NULL.
6767
*/
68-
CF_EXPORT void *_Nonnull __CFSafelyReallocate(void * _Nullable destination, size_t newCapacity, void (^_Nullable reallocationFailureHandler)(void *_Nonnull original, _Bool *_Nonnull outRecovered));
69-
CF_EXPORT void *_Nonnull __CFSafelyReallocateWithAllocator(CFAllocatorRef _Nullable, void * _Nullable destination, size_t newCapacity, CFOptionFlags options, void (^_Nullable reallocationFailureHandler)(void *_Nonnull original, _Bool *_Nonnull outRecovered));
68+
CF_EXPORT void *_Nonnull __CFSafelyReallocate(void * _Nullable destination, size_t newCapacity, void (^_Nullable reallocationFailureHandler)(void *_Nonnull original, bool *_Nonnull outRecovered));
69+
CF_EXPORT void *_Nonnull __CFSafelyReallocateWithAllocator(CFAllocatorRef _Nullable, void * _Nullable destination, size_t newCapacity, CFOptionFlags options, void (^_Nullable reallocationFailureHandler)(void *_Nonnull original, bool *_Nonnull outRecovered));
7070

7171
// ---- CFBundle material ----------------------------------------
7272

‎CoreFoundation/Collections.subproj/CFStorage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#include <dispatch/dispatch.h>
3838
#endif
3939

40-
#if DEPLOYMENT_TARGET_WINDOWS
41-
// Remember to use _CF_RESTRICT instead of restrict, which is correctly defined for DEPLOYMENT_TARGET_WINDOWS elsewhere.
40+
#if TARGET_OS_WIN32
41+
// Remember to use _CF_RESTRICT instead of restrict, which is correctly defined for TARGET_OS_WIN32 elsewhere.
4242

4343
// Replace bzero
4444
#define bzero(dst, size) ZeroMemory(dst, size)

‎CoreFoundation/Locale.subproj/CFLocale.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@ static void _setCachedCurrentLocale(CFLocaleRef newLocale) {
302302
}
303303

304304

305-
#if DEPLOYMENT_TARGET_MACOSX && !DEPLOYMENT_RUNTIME_SWIFT
305+
#if TARGET_OS_OSX && !DEPLOYMENT_RUNTIME_SWIFT
306306
#define FALLBACK_LOCALE_NAME CFSTR("")
307-
#elif DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
307+
#elif TARGET_OS_IPHONE
308308
#define FALLBACK_LOCALE_NAME CFSTR("en_US")
309-
#elif DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD || DEPLOYMENT_RUNTIME_SWIFT
309+
#elif TARGET_OS_WINDOWS || TARGET_OS_LINUX || TARGET_OS_BSD || DEPLOYMENT_RUNTIME_SWIFT
310310
#define FALLBACK_LOCALE_NAME CFSTR("en_US")
311311
#endif
312312

‎CoreFoundation/NumberDate.subproj/CFTimeZone.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
#include <unicode/udat.h>
2626
#include <unicode/ustring.h>
2727
#include <CoreFoundation/CFDateFormatter.h>
28-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
28+
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
2929
#include <dirent.h>
3030
#include <unistd.h>
3131
#if !TARGET_OS_ANDROID
3232
#include <sys/fcntl.h>
3333
#endif
3434
#endif
35-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
35+
#if TARGET_OS_MAC
3636
#include <tzfile.h>
3737
#define MACOS_TZDIR1 "/usr/share/zoneinfo/" // 10.12 and earlier
3838
#define MACOS_TZDIR2 "/var/db/timezone/zoneinfo/" // 10.13 onwards
3939

40-
#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
40+
#elif TARGET_OS_LINUX || TARGET_OS_BSD
4141
#ifndef TZDIR
4242
#define TZDIR "/usr/share/zoneinfo/" /* Time zone object file directory */
4343
#endif /* !defined TZDIR */
@@ -76,7 +76,7 @@ static CFArrayRef __CFKnownTimeZoneList = NULL;
7676
static CFMutableDictionaryRef __CFTimeZoneCache = NULL;
7777
static CFLock_t __CFTimeZoneGlobalLock = CFLockInit;
7878

79-
#if DEPLOYMENT_TARGET_WINDOWS
79+
#if TARGET_OS_WIN32
8080
static CFDictionaryRef __CFTimeZoneWinToOlsonDict = NULL;
8181
static CFLock_t __CFTimeZoneWinToOlsonLock = CFLockInit;
8282
#endif
@@ -105,7 +105,7 @@ CF_INLINE void __CFTimeZoneUnlockCompatibilityMapping(void) {
105105
__CFUnlock(&__CFTimeZoneCompatibilityMappingLock);
106106
}
107107

108-
#if DEPLOYMENT_TARGET_WINDOWS
108+
#if TARGET_OS_WIN32
109109
/* This function should be used for WIN32 instead of
110110
* __CFCopyRecursiveDirectoryList function.
111111
* It takes TimeZone names from the registry
@@ -141,7 +141,7 @@ static CFMutableArrayRef __CFCopyWindowsTimeZoneList() {
141141
RegCloseKey(hkResult);
142142
return result;
143143
}
144-
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
144+
#elif TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_BSD
145145
static CFMutableArrayRef __CFCopyRecursiveDirectoryList() {
146146
CFMutableArrayRef result = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks);
147147
if (!__tzDir) __InitTZStrings();
@@ -457,7 +457,7 @@ CFTypeID CFTimeZoneGetTypeID(void) {
457457
return _kCFRuntimeIDCFTimeZone;
458458
}
459459

460-
#if DEPLOYMENT_TARGET_WINDOWS
460+
#if TARGET_OS_WIN32
461461
static const char *__CFTimeZoneWinToOlsonDefaults =
462462
/* Mappings to time zones in Windows Registry are best-guess */
463463
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -694,7 +694,7 @@ static void __InitTZStrings(void) {
694694
__CFUnlock(&__CFTZDirLock);
695695
}
696696

697-
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
697+
#elif TARGET_OS_MAC
698698
static void __InitTZStrings(void) {
699699
static dispatch_once_t initOnce = 0;
700700

@@ -729,7 +729,7 @@ static void __InitTZStrings(void) {
729729
});
730730
}
731731

732-
#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
732+
#elif TARGET_OS_LINUX || TARGET_OS_BSD
733733
static void __InitTZStrings(void) {
734734
__tzZoneInfo = CFSTR(TZDIR);
735735
__tzDir = TZDIR "zone.tab";
@@ -744,7 +744,7 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
744744

745745
CFStringRef name = NULL;
746746

747-
#if DEPLOYMENT_TARGET_WINDOWS
747+
#if TARGET_OS_WIN32
748748
TIME_ZONE_INFORMATION tzi = { 0 };
749749
DWORD rval = GetTimeZoneInformation(&tzi);
750750
if (rval != TIME_ZONE_ID_INVALID) {
@@ -810,7 +810,7 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
810810
CFRelease(name);
811811
if (result) return result;
812812
}
813-
#if DEPLOYMENT_TARGET_ANDROID
813+
#if TARGET_OS_ANDROID
814814
// Timezone database by name not available on Android.
815815
// Approximate with gmtoff - could be general default.
816816
struct tm info;
@@ -1181,7 +1181,7 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
11811181

11821182
if (!__tzZoneInfo) __InitTZStrings();
11831183
if (!__tzZoneInfo) return NULL;
1184-
#if DEPLOYMENT_TARGET_WINDOWS
1184+
#if TARGET_OS_WIN32
11851185
baseURL = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, __tzZoneInfo, kCFURLWindowsPathStyle, true);
11861186
#else
11871187
baseURL = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, __tzZoneInfo, kCFURLPOSIXPathStyle, true);
@@ -1381,7 +1381,7 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
13811381

13821382
if (!__tzZoneInfo) __InitTZStrings();
13831383
if (!__tzZoneInfo) return NULL;
1384-
#if DEPLOYMENT_TARGET_WINDOWS
1384+
#if TARGET_OS_WIN32
13851385
baseURL = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, __tzZoneInfo, kCFURLWindowsPathStyle, true);
13861386
#else
13871387
baseURL = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, __tzZoneInfo, kCFURLPOSIXPathStyle, true);
@@ -1459,7 +1459,7 @@ CFDataRef CFTimeZoneGetData(CFTimeZoneRef tz) {
14591459
/* This function converts CFAbsoluteTime to (Win32) SYSTEMTIME
14601460
* (Aleksey Dukhnyakov)
14611461
*/
1462-
#if DEPLOYMENT_TARGET_WINDOWS
1462+
#if TARGET_OS_WIN32
14631463
BOOL __CFTimeZoneGetWin32SystemTime(SYSTEMTIME * sys_time, CFAbsoluteTime time)
14641464
{
14651465
LONGLONG l;

‎CoreFoundation/PlugIn.subproj/CFBundle.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void _CFBundleEnsureBundlesExistForImagePaths(CFArrayRef imagePaths);
135135

136136
#pragma mark -
137137

138-
#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
138+
#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
139139

140140
// Functions and constants for FHS bundles:
141141
#define _CFBundleFHSDirectory_share CFSTR("share")
@@ -160,7 +160,7 @@ static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) {
160160

161161
return isFHSBundle;
162162
}
163-
#endif // !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
163+
#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
164164

165165
CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles() {
166166
#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
@@ -726,7 +726,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL,
726726

727727
bundle->_url = newURL;
728728

729-
#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
729+
#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
730730
bundle->_isFHSInstalledBundle = _CFBundleURLIsForFHSInstalledBundle(newURL);
731731
#endif
732732

0 commit comments

Comments
 (0)