Skip to content

Commit 08b260e

Browse files
compnerdcompnerd
committed
DEPLOYMENT_TARGET_LINUX -> TARGET_OS_LINUX
1 parent db68efd commit 08b260e

38 files changed

+179
-181
lines changed

Diff for: ‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ if(FOUNDATION_ENABLE_LIBDISPATCH)
8787
endif()
8888

8989
if(CMAKE_SYSTEM_NAME STREQUAL Android OR CMAKE_SYSTEM_NAME STREQUAL Linux)
90-
set(deployment_target -DDEPLOYMENT_TARGET_LINUX)
9190
set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN")
9291
set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR})
9392
elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
342342
FindClose(handle);
343343
pathBuf[pathLength] = '\0';
344344

345-
#elif TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
345+
#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
346346
uint8_t extBuff[CFMaxPathSize];
347347
int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :(
348348

@@ -452,13 +452,13 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
452452
isDir = ((statBuf.st_mode & S_IFMT) == S_IFDIR);
453453
}
454454
}
455-
#if DEPLOYMENT_TARGET_LINUX
455+
#if TARGET_OS_LINUX
456456
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, namelen, isDir, dirURL);
457457
#else
458458
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, dp->d_namlen, isDir, dirURL);
459459
#endif
460460
} else {
461-
#if DEPLOYMENT_TARGET_LINUX
461+
#if TARGET_OS_LINUX
462462
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase (alloc, (uint8_t *)dp->d_name, namelen, false, dirURL);
463463
#else
464464
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
545545

546546
if (modTime != NULL) {
547547
if (fileExists) {
548-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
548+
#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
549549
struct timespec ts = {statBuf.st_mtime, 0};
550550
#else
551551
struct timespec ts = statBuf.st_mtimespec;
@@ -1072,7 +1072,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla
10721072
struct dirent *dent;
10731073
if ((dirp = opendir(directoryPathBuf))) {
10741074
while ((dent = readdir(dirp))) {
1075-
#if DEPLOYMENT_TARGET_LINUX
1075+
#if TARGET_OS_LINUX
10761076
CFIndex nameLen = strlen(dent->d_name);
10771077
if (dent->d_type == DT_UNKNOWN) {
10781078
// 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
11411141
if (dent->d_type == DT_DIR) {
11421142
isDirectory = true;
11431143
}
1144-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
1144+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
11451145
else if (dent->d_type == DT_UNKNOWN) {
11461146
// We need to do an additional stat on this to see if it's really a directory or not.
11471147
// This path should be uncommon.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ CF_EXPORT void * __CFConstantStringClassReferencePtr;
428428

429429
#if DEPLOYMENT_RUNTIME_SWIFT && TARGET_OS_MAC
430430

431-
#if DEPLOYMENT_TARGET_LINUX
431+
#if TARGET_OS_LINUX
432432
#define CONST_STRING_SECTION __attribute__((section(".cfstr.data")))
433433
#else
434434
#define CONST_STRING_SECTION
@@ -543,7 +543,7 @@ CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) {
543543
return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0);
544544
}
545545

546-
#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
546+
#elif TARGET_OS_LINUX || TARGET_OS_BSD
547547

548548
typedef int32_t CFLock_t;
549549
#define CFLockInit 0
@@ -971,7 +971,7 @@ CF_EXPORT bool _NS_pthread_equal(_CFThreadRef t1, _CFThreadRef t2);
971971

972972
#endif
973973

974-
#if DEPLOYMENT_TARGET_LINUX
974+
#if TARGET_OS_LINUX
975975
#define pthread_main_np _CFIsMainThread
976976
#endif
977977

@@ -1026,7 +1026,7 @@ enum {
10261026
};
10271027
#endif
10281028

1029-
#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS
1029+
#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS
10301030
#define QOS_CLASS_USER_INITIATED DISPATCH_QUEUE_PRIORITY_HIGH
10311031
#define QOS_CLASS_DEFAULT DISPATCH_QUEUE_PRIORITY_DEFAULT
10321032
#define QOS_CLASS_UTILITY DISPATCH_QUEUE_PRIORITY_LOW

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const char *_CFProcessPath(void) {
161161
}
162162
#endif
163163

164-
#if DEPLOYMENT_TARGET_LINUX
164+
#if TARGET_OS_LINUX
165165
#include <unistd.h>
166166
#if __has_include(<syscall.h>)
167167
#include <syscall.h>
@@ -206,7 +206,7 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) {
206206
}
207207

208208

209-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
209+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
210210

211211
#include <pwd.h>
212212
#include <sys/param.h>
@@ -262,7 +262,7 @@ CF_EXPORT CFStringRef CFGetUserName(void) {
262262

263263
CF_EXPORT CFStringRef CFCopyUserName(void) {
264264
CFStringRef result = NULL;
265-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
265+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
266266
uid_t euid;
267267
__CFGetUGIDs(&euid, NULL);
268268
struct passwd *upwd = getpwuid(euid ? euid : getuid());
@@ -332,7 +332,7 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) {
332332

333333

334334
CFURLRef CFCopyHomeDirectoryURL(void) {
335-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
335+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
336336
return _CFCopyHomeDirURLForUser(NULL, true);
337337
#elif DEPLOYMENT_TARGET_WINDOWS
338338
CFURLRef retVal = NULL;
@@ -412,7 +412,7 @@ CF_EXPORT CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName) {
412412
}
413413
}
414414
#endif
415-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
415+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
416416
if (!uName) {
417417
return _CFCopyHomeDirURLForUser(NULL, true);
418418
} else {
@@ -614,7 +614,7 @@ CF_PRIVATE void __CFTSDInitialize() {
614614
static void __CFTSDSetSpecific(void *arg) {
615615
#if TARGET_OS_OSX || TARGET_OS_IPHONE
616616
pthread_setspecific(__CFTSDIndexKey, arg);
617-
#elif DEPLOYMENT_TARGET_LINUX
617+
#elif TARGET_OS_LINUX
618618
pthread_setspecific(__CFTSDIndexKey, arg);
619619
#elif DEPLOYMENT_TARGET_WINDOWS
620620
FlsSetValue(__CFTSDIndexKey, arg);
@@ -624,7 +624,7 @@ static void __CFTSDSetSpecific(void *arg) {
624624
static void *__CFTSDGetSpecific() {
625625
#if TARGET_OS_OSX || TARGET_OS_IPHONE
626626
return pthread_getspecific(__CFTSDIndexKey);
627-
#elif DEPLOYMENT_TARGET_LINUX
627+
#elif TARGET_OS_LINUX
628628
return pthread_getspecific(__CFTSDIndexKey);
629629
#elif DEPLOYMENT_TARGET_WINDOWS
630630
return FlsGetValue(__CFTSDIndexKey);
@@ -1182,7 +1182,7 @@ CF_PRIVATE int _NS_gettimeofday(struct timeval *tv, struct timezone *tz) {
11821182
#pragma mark -
11831183
#pragma mark Linux OSAtomic
11841184

1185-
#if defined(DEPLOYMENT_TARGET_LINUX) || TARGET_OS_BSD
1185+
#if TARGET_OS_LINUX || TARGET_OS_BSD
11861186

11871187
bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst)
11881188
{
@@ -1237,7 +1237,7 @@ void OSMemoryBarrier() {
12371237
__sync_synchronize();
12381238
}
12391239

1240-
#endif // DEPLOYMENT_TARGET_LINUX
1240+
#endif // TARGET_OS_LINUX
12411241

12421242
#pragma mark -
12431243
#pragma mark Dispatch Replacements
@@ -1348,7 +1348,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
13481348
#pragma mark -
13491349
#pragma mark Windows and Linux Helpers
13501350

1351-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
1351+
#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
13521352

13531353
#include <stdio.h>
13541354

@@ -1483,15 +1483,15 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_
14831483
}
14841484

14851485
return 0;
1486-
#elif DEPLOYMENT_TARGET_LINUX
1486+
#elif TARGET_OS_LINUX
14871487
return pthread_setname_np(thread, name);
14881488
#endif
14891489
}
14901490

14911491
CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) {
14921492
#if TARGET_OS_OSX || TARGET_OS_IPHONE
14931493
return pthread_getname_np(pthread_self(), buf, length);
1494-
#elif DEPLOYMENT_TARGET_LINUX
1494+
#elif TARGET_OS_LINUX
14951495
return pthread_getname_np(pthread_self(), buf, length);
14961496
#endif
14971497
return -1;
@@ -1516,7 +1516,7 @@ int _CFOpenFile(const char *path, int opts) {
15161516
}
15171517

15181518
CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
1519-
#if TARGET_OS_WIN32 || DEPLOYMENT_TARGET_LINUX
1519+
#if TARGET_OS_WIN32 || TARGET_OS_LINUX
15201520
void *mem = realloc(ptr, size);
15211521
if (mem == NULL && ptr != NULL && size != 0) {
15221522
free(ptr);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ __kCFRetainEvent = 28,
5050
__kCFReleaseEvent = 29
5151
};
5252

53-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
53+
#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
5454
#include <malloc.h>
5555
#elif TARGET_OS_BSD
5656
#include <stdlib.h> // malloc()
@@ -406,7 +406,7 @@ CF_INLINE CFRuntimeBase *_cf_aligned_malloc(size_t align, CFIndex size, const ch
406406

407407
#if TARGET_OS_OSX || TARGET_OS_IPHONE
408408
memory = malloc_zone_memalign(malloc_default_zone(), align, size);
409-
#elif DEPLOYMENT_TARGET_LINUX
409+
#elif TARGET_OS_LINUX
410410
int result = posix_memalign((void **)&memory, /*alignment*/ align, size);
411411
int error = errno;
412412
enum { errorStringBufferLength = 64 };
@@ -1094,7 +1094,7 @@ Boolean __CFInitialized = 0;
10941094
// move the next 2 lines down into the #if below, and make it static, after Foundation gets off this symbol on other platforms.
10951095
CF_EXPORT _CFThreadRef _CFMainPThread;
10961096
_CFThreadRef _CFMainPThread = kNilPthreadT;
1097-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
1097+
#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
10981098

10991099
CF_EXPORT _CFThreadRef _CF_pthread_main_thread_np(void);
11001100
_CFThreadRef _CF_pthread_main_thread_np(void) {
@@ -1106,7 +1106,7 @@ _CFThreadRef _CF_pthread_main_thread_np(void) {
11061106

11071107

11081108

1109-
#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
1109+
#if TARGET_OS_LINUX || TARGET_OS_BSD
11101110
static void __CFInitialize(void) __attribute__ ((constructor));
11111111
static
11121112
#endif

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 TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX
154+
#elif TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX
155155
static Boolean useV1UUIDs = false, checked = false;
156156
uuid_t uuid;
157157
if (!checked) {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#include <os/lock.h>
6060
#endif
6161

62-
#if DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
62+
#if TARGET_OS_LINUX || TARGET_OS_BSD
6363
#include <string.h>
6464
#include <sys/mman.h>
6565
#endif
@@ -71,7 +71,7 @@
7171
#include <pthread.h>
7272
#endif
7373

74-
#if DEPLOYMENT_TARGET_LINUX
74+
#if TARGET_OS_LINUX
7575
#ifdef HAVE_SCHED_GETAFFINITY
7676
#include <sched.h>
7777
#endif
@@ -448,7 +448,7 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() {
448448
if (result != 0) {
449449
pcnt = 0;
450450
}
451-
#elif DEPLOYMENT_TARGET_LINUX
451+
#elif TARGET_OS_LINUX
452452

453453
#ifdef HAVE_SCHED_GETAFFINITY
454454
cpu_set_t set;
@@ -475,7 +475,7 @@ CF_PRIVATE CFIndex __CFProcessorCount() {
475475
if (result != 0) {
476476
pcnt = 0;
477477
}
478-
#elif DEPLOYMENT_TARGET_LINUX
478+
#elif TARGET_OS_LINUX
479479
pcnt = sysconf(_SC_NPROCESSORS_CONF);
480480
#else
481481
// Assume the worst
@@ -493,7 +493,7 @@ CF_PRIVATE uint64_t __CFMemorySize() {
493493
if (result != 0) {
494494
memsize = 0;
495495
}
496-
#elif DEPLOYMENT_TARGET_LINUX
496+
#elif TARGET_OS_LINUX
497497
memsize = sysconf(_SC_PHYS_PAGES);
498498
memsize *= sysconf(_SC_PAGESIZE);
499499
#endif
@@ -712,7 +712,7 @@ typedef enum {
712712

713713
static bool also_do_stderr(const _cf_logging_style style) {
714714
bool result = false;
715-
#if DEPLOYMENT_TARGET_LINUX
715+
#if TARGET_OS_LINUX
716716
// just log to stderr, other logging facilities are out
717717
result = true;
718718
#elif TARGET_OS_OSX || TARGET_OS_IPHONE
@@ -1232,7 +1232,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean
12321232
if (0LL == statBuf.st_size) {
12331233
bytes = malloc(8); // don't return constant string -- it's freed!
12341234
length = 0;
1235-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
1235+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_LINUX || TARGET_OS_BSD
12361236
} else if (map) {
12371237
if((void *)-1 == (bytes = mmap(0, (size_t)statBuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0))) {
12381238
int32_t savederrno = errno;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ typedef int boolean_t;
143143
#include <sys/stat.h> // mode_t
144144
#endif
145145

146-
#if DEPLOYMENT_TARGET_LINUX
146+
#if TARGET_OS_LINUX
147147

148148
#define CF_PRIVATE extern __attribute__((visibility("hidden")))
149149
#define __weak
@@ -260,10 +260,10 @@ void OSMemoryBarrier();
260260

261261
#endif
262262

263-
#if DEPLOYMENT_TARGET_LINUX
263+
#if TARGET_OS_LINUX
264264
#include <sys/param.h>
265265
#endif
266-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
266+
#if DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
267267
#if !defined(ABS)
268268
#define ABS(A) ((A) < 0 ? (-(A)) : (A))
269269
#endif
@@ -454,7 +454,7 @@ CF_EXPORT int64_t OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *_
454454
#define CF_TEST_PRIVATE CF_PRIVATE
455455
#endif
456456

457-
#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS
457+
#if TARGET_OS_LINUX || DEPLOYMENT_TARGET_WINDOWS
458458

459459
#include <stdarg.h>
460460

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CF_IMPLICIT_BRIDGING_DISABLED
4646

4747
// ---- CFRuntime material ----------------------------------------
4848

49-
#if DEPLOYMENT_TARGET_LINUX
49+
#if TARGET_OS_LINUX
5050
#include <malloc.h>
5151
#elif TARGET_OS_BSD
5252
#include <stdlib.h> // malloc()

Diff for: ‎CoreFoundation/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ endif()
336336
if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android)
337337
target_compile_definitions(CoreFoundation
338338
PRIVATE
339-
-DDEPLOYMENT_TARGET_LINUX
340339
-D_GNU_SOURCE)
341340
if(HAVE_SCHED_GETAFFINITY)
342341
target_compile_definitions(CoreFoundation

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CF_INLINE unsigned long __CFPageSize() {
4343
GetSystemInfo(&sysInfo);
4444
return sysInfo.dwPageSize;
4545
}
46-
#elif DEPLOYMENT_TARGET_LINUX
46+
#elif TARGET_OS_LINUX
4747
#include <unistd.h>
4848
CF_INLINE unsigned long __CFPageSize() {
4949
return (unsigned long)getpagesize();

Diff for: ‎CoreFoundation/Locale.subproj/CFDateFormatter.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,7 @@ static UDate __CFDateFormatterCorrectTimeToARangeAroundCurrentDate(UCalendar *ca
15571557
return __CFDateFormatterCorrectTimeWithTarget(calendar, at, currEraOrCentury+offset, isEra, status);
15581558
}
15591559

1560-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
1560+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
15611561
static int32_t __CFDateFormatterGetMaxYearGivenJapaneseEra(UCalendar *calendar, int32_t era, UErrorCode *status) {
15621562
int32_t years = 0;
15631563
__cficu_ucal_clear(calendar);
@@ -1610,7 +1610,7 @@ static Boolean __CFDateFormatterHandleAmbiguousYear(CFDateFormatterRef formatter
16101610
}
16111611
}
16121612
} else if (calendar_id == kCFCalendarIdentifierJapanese) { // ??? need more work
1613-
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
1613+
#if TARGET_OS_OSX || TARGET_OS_IPHONE || DEPLOYMENT_TARGET_WINDOWS || TARGET_OS_LINUX
16141614
__cficu_ucal_clear(cal);
16151615
__cficu_ucal_set(cal, UCAL_ERA, 1);
16161616
__cficu_udat_parseCalendar(df, cal, ustr, length, NULL, status);

0 commit comments

Comments
 (0)