Skip to content

Commit 017b2da

Browse files
committed
Enable nanoseconds on all architectures for s-c-f.
1 parent 3da9a31 commit 017b2da

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

CoreFoundation/Locale.subproj/CFCalendar.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ enum {
2727
#pragma GCC diagnostic pop
2828
};
2929

30+
// In Swift Foundation, nanoseconds are always available.
31+
#define _CF_CALENDAR_NANOSECONDS_AVAILABLE 1
3032

3133
#define ICU_LOG(FMT, ...) do { } while (0)
3234

@@ -2019,7 +2021,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
20192021
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
20202022
return second;
20212023
}
2022-
#if __LP64__
2024+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
20232025
#pragma GCC diagnostic push
20242026
#pragma GCC diagnostic ignored "-Wswitch-enum"
20252027
case kCFCalendarUnitNanosecond: {
@@ -2106,7 +2108,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
21062108
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
21072109
return second;
21082110
}
2109-
#if __LP64__
2111+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
21102112
#pragma GCC diagnostic push
21112113
#pragma GCC diagnostic ignored "-Wswitch-enum"
21122114
case kCFCalendarUnitNanosecond: {
@@ -2229,7 +2231,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
22292231
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
22302232
return second;
22312233
}
2232-
#if __LP64__
2234+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
22332235
#pragma GCC diagnostic push
22342236
#pragma GCC diagnostic ignored "-Wswitch-enum"
22352237
case kCFCalendarUnitNanosecond: {
@@ -2294,7 +2296,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
22942296
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
22952297
return second;
22962298
}
2297-
#if __LP64__
2299+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
22982300
#pragma GCC diagnostic push
22992301
#pragma GCC diagnostic ignored "-Wswitch-enum"
23002302
case kCFCalendarUnitNanosecond: {
@@ -2345,7 +2347,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
23452347
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
23462348
return second;
23472349
}
2348-
#if __LP64__
2350+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
23492351
#pragma GCC diagnostic push
23502352
#pragma GCC diagnostic ignored "-Wswitch-enum"
23512353
case kCFCalendarUnitNanosecond: {
@@ -2386,7 +2388,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
23862388
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
23872389
return second;
23882390
}
2389-
#if __LP64__
2391+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
23902392
#pragma GCC diagnostic push
23912393
#pragma GCC diagnostic ignored "-Wswitch-enum"
23922394
case kCFCalendarUnitNanosecond: {
@@ -2419,7 +2421,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
24192421
CFIndex second = (minute - 1) * 60 + __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
24202422
return second;
24212423
}
2422-
#if __LP64__
2424+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
24232425
#pragma GCC diagnostic push
24242426
#pragma GCC diagnostic ignored "-Wswitch-enum"
24252427
case kCFCalendarUnitNanosecond: {
@@ -2445,7 +2447,7 @@ static CFIndex __CFCalendarGetOrdinalityOfUnit3(CFCalendarRef calendar, CFCalend
24452447
CFIndex second = __cficu_ucal_get(calendar->_cal, UCAL_SECOND, &status) + 1;
24462448
return second;
24472449
}
2448-
#if __LP64__
2450+
#if _CF_CALENDAR_NANOSECONDS_AVAILABLE
24492451
#pragma GCC diagnostic push
24502452
#pragma GCC diagnostic ignored "-Wswitch-enum"
24512453
case kCFCalendarUnitNanosecond: {

0 commit comments

Comments
 (0)