Skip to content

Commit 1fa7df4

Browse files
compnerdcompnerd
committed
DEPLOYMENT_TARGET_EMBEDDED -> TARGET_OS_IPHONE
1 parent e0cd4ea commit 1fa7df4

36 files changed

+163
-163
lines changed

Diff for: ‎CoreFoundation/Base.subproj/CFInternal.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ CF_PRIVATE Boolean __CFProcessIsRestricted(void);
421421

422422
// Be sure to call this before your SAFE_STACK_BUFFER exits scope.
423423
#define SAFE_STACK_BUFFER_CLEANUP(Name) if (__ ## Name ## WasMallocd) free(Name)
424-
#endif // DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
424+
#endif // !DEPLOYMENT_TARGET_WINDOWS
425425

426426

427427
CF_EXPORT void * __CFConstantStringClassReferencePtr;
@@ -856,7 +856,7 @@ CF_INLINE uintptr_t __CFISAForTypeID(CFTypeID typeID) {
856856
// DEFINE_WEAK_CARBONCORE_FUNC(void, DisposeHandle, (Handle h), (h))
857857
//
858858

859-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
859+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
860860

861861
extern void *__CFLookupCFNetworkFunction(const char *name);
862862

@@ -881,7 +881,7 @@ extern void *__CFLookupCFNetworkFunction(const char *name);
881881

882882
#define DEFINE_WEAK_CARBONCORE_FUNC(R, N, P, A, ...)
883883

884-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
884+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
885885

886886
extern void *__CFLookupCoreServicesInternalFunction(const char *name);
887887

@@ -1083,7 +1083,7 @@ CF_PRIVATE uint8_t *_CFDataGetBytePtrNonObjC(CFDataRef data);
10831083
#pragma mark -
10841084
#pragma mark CF Instruments SPI
10851085

1086-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1086+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
10871087
extern void __CFRecordAllocationEvent(int eventnum, void *ptr, int64_t size, uint64_t data, const char *classname);
10881088
#else
10891089
#define __CFRecordAllocationEvent(a, b, c, d, e) ((void)0)

Diff for: ‎CoreFoundation/Base.subproj/CFPlatform.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) {
14981498
}
14991499

15001500
CF_EXPORT char **_CFEnviron(void) {
1501-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1501+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
15021502
return *_NSGetEnviron();
15031503
#elif DEPLOYMENT_TARGET_WINDOWS
15041504
return _environ;

Diff for: ‎CoreFoundation/Base.subproj/CFRuntime.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <CoreFoundation/CFUUID.h>
3434
#include <CoreFoundation/CFTimeZone.h>
3535
#include <CoreFoundation/CFCalendar.h>
36-
#if DEPLOYMENT_TARGET_EMBEDDED
36+
#if TARGET_OS_IPHONE
3737
// This isn't in the embedded runtime.h header
3838
OBJC_EXPORT void *objc_destructInstance(id obj);
3939
#endif
@@ -60,7 +60,7 @@ __kCFReleaseEvent = 29
6060

6161
#define FAKE_INSTRUMENTS 0
6262

63-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
63+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
6464
CF_PRIVATE void __CFOAInitializeNSObject(void); // from NSObject.m
6565

6666
bool __CFOASafe = false;
@@ -404,7 +404,7 @@ CF_INLINE uint32_t __CFHighRCFromInfo(__CFInfoType info) {
404404
CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const char *className) {
405405
CFRuntimeBase *memory;
406406

407-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
407+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
408408
memory = malloc_zone_memalign(malloc_default_zone(), align, size);
409409
#elif DEPLOYMENT_TARGET_LINUX
410410
int result = posix_memalign((void **)&memory, /*alignment*/ align, size);
@@ -1162,7 +1162,7 @@ void __CFInitialize(void) {
11621162
#endif
11631163

11641164

1165-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1165+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
11661166
{
11671167
CFIndex idx, cnt;
11681168
char **args = *_NSGetArgv();
@@ -1256,7 +1256,7 @@ void __CFInitialize(void) {
12561256
if (value && (*value == 'Y' || *value == 'y')) __CFDeallocateZombies = 0xff;
12571257
#endif
12581258

1259-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED)
1259+
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE)
12601260
CFLog(kCFLogLevelWarning, CFSTR("Assertions enabled"));
12611261
#endif
12621262

Diff for: ‎CoreFoundation/Base.subproj/CFSystemDirectories.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <CoreFoundation/CFPriv.h>
1919
#include "CFInternal.h"
2020

21-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
21+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
2222

2323
/* We use the System framework implementation on Mach.
2424
*/
@@ -52,7 +52,7 @@ CFSearchPathEnumerationState __CFGetNextSearchPathEnumeration(CFSearchPathEnumer
5252
#endif
5353

5454

55-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
55+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
5656

5757
CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde) {
5858
CFMutableArrayRef array;

Diff for: ‎CoreFoundation/Base.subproj/CFUUID.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ CFUUIDRef CFUUIDCreate(CFAllocatorRef alloc) {
151151
long rStatus = UuidCreate(&u);
152152
if (RPC_S_OK != rStatus && RPC_S_UUID_LOCAL_ONLY != rStatus) retval = 1;
153153
memmove(&bytes, &u, sizeof(bytes));
154-
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX
154+
#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX
155155
static Boolean useV1UUIDs = false, checked = false;
156156
uuid_t uuid;
157157
if (!checked) {

Diff for: ‎CoreFoundation/Base.subproj/CFUtilities.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "CFLocaleInternal.h"
1515
#include "CFBundle_Internal.h"
1616
#include <CoreFoundation/CFPriv.h>
17-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
17+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS
1818
#include <CoreFoundation/CFBundle.h>
1919
#endif
2020
#include <CoreFoundation/CFURLAccess.h>
@@ -29,7 +29,7 @@
2929
#include <string.h>
3030
#include <stdio.h>
3131
#include <stdlib.h>
32-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
32+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
3333
#include <asl.h>
3434
#else
3535
#define ASL_LEVEL_EMERG 0
@@ -225,7 +225,7 @@ static CFStringRef copySystemVersionPath(CFStringRef suffix) {
225225
// Looks for localized version of "nonLocalized" in the SystemVersion bundle
226226
// If not found, and returnNonLocalizedFlag == true, will return the non localized string (retained of course), otherwise NULL
227227
// If bundlePtr != NULL, will use *bundlePtr and will return the bundle in there; otherwise bundle is created and released
228-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
228+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
229229
static CFStringRef _CFCopyLocalizedVersionKey(CFBundleRef *bundlePtr, CFStringRef nonLocalized) {
230230
CFStringRef localized = NULL;
231231
CFBundleRef locBundle = bundlePtr ? *bundlePtr : NULL;
@@ -392,7 +392,7 @@ CF_PRIVATE void *__CFLookupCarbonCoreFunction(const char *name) {
392392
}
393393
#endif
394394

395-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
395+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
396396
CF_PRIVATE void *__CFLookupCoreServicesInternalFunction(const char *name) {
397397
static void *image = NULL;
398398
static dispatch_once_t onceToken;
@@ -692,7 +692,7 @@ void CFShow(const void *obj) {
692692
// message must be a UTF8-encoded, null-terminated, byte buffer with at least length bytes
693693
typedef void (*CFLogFunc)(int32_t lev, const char *message, size_t length, char withBanner);
694694

695-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
695+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
696696
static Boolean debugger_attached() {
697697
BOOL debuggerAttached = NO;
698698
struct proc_bsdshortinfo info;
@@ -715,7 +715,7 @@ static bool also_do_stderr(const _cf_logging_style style) {
715715
#if DEPLOYMENT_TARGET_LINUX
716716
// just log to stderr, other logging facilities are out
717717
result = true;
718-
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
718+
#elif DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
719719
if (style == _cf_logging_style_os_log) {
720720
//
721721
// 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
889889
_populateBanner(&banner, &time, &thread, &bannerLen);
890890
}
891891

892-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
892+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
893893
#pragma GCC diagnostic push
894894
#pragma GCC diagnostic ignored "-Wdeprecated"
895895
uid_t euid;
@@ -1037,7 +1037,7 @@ void CFLog1(CFLogLevel lev, CFStringRef message) {
10371037

10381038

10391039

1040-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1040+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
10411041

10421042
kern_return_t _CFDiscorporateMemoryAllocate(CFDiscorporateMemory *hm, size_t size, bool purgeable) {
10431043
kern_return_t ret = KERN_SUCCESS;

Diff for: ‎CoreFoundation/Base.subproj/CoreFoundation_Prefix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extern "C" {
4545
#define pthread_set_qos_class_self_np(A, B) do {} while (0)
4646
#define pthread_override_qos_class_start_np(A, B, C) (NULL)
4747
#define pthread_override_qos_class_end_np(A) do {} while (0)
48-
#elif (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED)
48+
#elif (DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE)
4949
#include <pthread.h>
5050
#include <pthread/qos.h>
5151
#endif

Diff for: ‎CoreFoundation/Base.subproj/ForFoundationOnly.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ CF_IMPLICIT_BRIDGING_DISABLED
5555
#include <mach/mach_time.h>
5656
#endif
5757

58-
#if (INCLUDE_OBJC || DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT
58+
#if (INCLUDE_OBJC || DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT
5959
#include <objc/message.h>
6060
#endif
6161

@@ -465,7 +465,7 @@ CF_EXPORT const void *_CFArrayCheckAndGetValueAtIndex(CFArrayRef array, CFIndex
465465
CF_EXPORT void _CFArrayReplaceValues(CFMutableArrayRef array, CFRange range, const void *_Nullable * _Nullable newValues, CFIndex newCount);
466466

467467

468-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
468+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
469469
/* Enumeration
470470
Call CFStartSearchPathEnumeration() once, then call
471471
CFGetNextSearchPathEnumeration() one or more times with the returned state.
@@ -545,7 +545,7 @@ CF_EXPORT Boolean _CFRunLoopIsCurrent(CFRunLoopRef rl);
545545
CF_EXPORT CFIndex _CFStreamInstanceSize(void);
546546
CF_EXPORT CFReadStreamRef CFReadStreamCreateWithData(_Nullable CFAllocatorRef alloc, CFDataRef data);
547547

548-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
548+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
549549
typedef struct {
550550
mach_vm_address_t address;
551551
mach_vm_size_t size;
@@ -586,7 +586,7 @@ CF_INLINE UInt64 __CFReadTSR(void) {
586586
#endif
587587
#endif
588588

589-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
589+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
590590

591591
/* Identical to CFStringGetFileSystemRepresentation, but returns additional information about the failure.
592592
*/

Diff for: ‎CoreFoundation/Collections.subproj/CFBasicHash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121
#include "CFOverflow.h"
2222

23-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
23+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
2424
#define __SetLastAllocationEventName(A, B) do { if (__CFOASafe && (A)) __CFSetLastAllocationEventName(A, B); } while (0)
2525
#else
2626
#define __SetLastAllocationEventName(A, B) do { } while (0)

Diff for: ‎CoreFoundation/Collections.subproj/CFStorage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ CFStorageRef CFStorageCreate(CFAllocatorRef allocator, CFIndex valueSize) {
10911091
storage->valueSize = valueSize;
10921092
/* if valueSize is a power of 2, then set the shifter to the log base 2 of valueSize. Otherwise set it to NO_SHIFTER */
10931093
if (valueSize > 0 && !(valueSize & (valueSize - 1))) {
1094-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
1094+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
10951095
storage->byteToValueShifter = __builtin_ctzl(valueSize);
10961096
#else
10971097
CFIndex tempSize = valueSize;

Diff for: ‎CoreFoundation/Error.subproj/CFError.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "CFRuntime_Internal.h"
1515
#include <CoreFoundation/CFPriv.h>
1616
#include <CoreFoundation/ForFoundationOnly.h>
17-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
17+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
1818
#include <mach/mach_error.h>
1919
#endif
2020

@@ -250,7 +250,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) {
250250
if (reason) {
251251
CFStringRef const backstopComboString = CFSTR("%@ %@");
252252
CFStringRef comboString = backstopComboString;
253-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
253+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS
254254
CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation"));
255255
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.')");
256256
#endif
@@ -265,7 +265,7 @@ CFStringRef _CFErrorCreateLocalizedDescription(CFErrorRef err) {
265265
}
266266
}
267267

268-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
268+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS
269269
// 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.
270270
CFBundleRef cfBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreFoundation"));
271271
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) {
281281
}
282282
if (reasonOrDesc) CFRelease(reasonOrDesc);
283283
return result;
284-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
284+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS
285285
}
286286

287287
// 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
495495
if (!errStr) return NULL;
496496
if (CFEqual(key, kCFErrorDescriptionKey)) return errStr; // If all we wanted was the non-localized description, we're done
497497

498-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
498+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
499499
// We need a kCFErrorLocalizedFailureReasonKey, so look up a possible localization for the error message
500500
// Look for the bundle in /System/Library/CoreServices/CoreTypes.bundle
501501
CFArrayRef paths = CFCopySearchPathForDirectoriesInDomains(kCFLibraryDirectory, kCFSystemDomainMask, false);
@@ -534,7 +534,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR
534534
return errStr;
535535
}
536536

537-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
537+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
538538
/* Built-in callback for Mach domain.
539539
*/
540540
static CFTypeRef _CFErrorMachCallBack(CFErrorRef err, CFStringRef key) CF_RETURNS_RETAINED {
@@ -565,7 +565,7 @@ static void _CFErrorInitializeCallBackTable(void) {
565565
_CFErrorCallBackTable = table;
566566
// Register the known providers, going thru a special variant of the function that doesn't lock
567567
__CFErrorSetCallBackForDomainNoLock(kCFErrorDomainPOSIX, _CFErrorPOSIXCallBack);
568-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
568+
#if DEPLOYMENT_TARGET_MACOSX || TARGET_OS_IPHONE
569569
__CFErrorSetCallBackForDomainNoLock(kCFErrorDomainMach, _CFErrorMachCallBack);
570570
#endif
571571
__CFUnlock(&_CFErrorSpinlock);

0 commit comments

Comments
 (0)