Fix boundary styles outside of Darwin.

Author: millenomi

CoreFoundation/CMakeLists.txt

@@ -145,6 +145,7 @@ add_framework(CoreFoundation
                 StringEncodings.subproj/CFStringEncodingConverterExt.h
                 URL.subproj/CFURLPriv.h
                 URL.subproj/CFURLSessionInterface.h
+                Locale.subproj/CFDateIntervalFormatter.h
 
                 # AppServices
                 AppServices.subproj/CFNotificationCenter.h

CoreFoundation/Locale.subproj/CFDateIntervalFormatter.c

@@ -151,6 +151,7 @@ static void updateFormatter(CFDateIntervalFormatterRef dif) {
             CFLog(kCFLogLevelError, CFSTR("udtitvfmt_open failed!  Formatter is NULL! -- locale: %s, template: %@, timezone: %@, status: %s"), localeBuffer, unretainedTemplate, unretainedTimeZoneName, u_errorName(status));
         }
 
+#if TARGET_OS_MAC
         UDateIntervalFormatAttributeValue uDateIntervalMinimizationStyle = UDTITVFMT_MINIMIZE_NONE;
         const _CFDateIntervalFormatterBoundaryStyle type = dif->_boundaryStyle;
         switch (type) {
@@ -167,6 +168,7 @@ static void updateFormatter(CFDateIntervalFormatterRef dif) {
                 CFLog(kCFLogLevelError, CFSTR("udtitvfmt_setAttribute failed!  Tried to set minimize type: %d and got status code: %s"), (int)dif->_boundaryStyle, u_errorName(status));
             }
         }
+#endif
 
         CFRelease(locale);
         CFRelease(timeZone);

CoreFoundation/Locale.subproj/CFDateIntervalFormatter.h

@@ -33,7 +33,9 @@ typedef CF_ENUM(CFIndex, CFDateIntervalFormatterStyle) {
 
 typedef CF_ENUM(CFIndex, _CFDateIntervalFormatterBoundaryStyle) {
     kCFDateIntervalFormatterBoundaryStyleDefault = 0,
+#if TARGET_OS_MAC
     kCFDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths = 1,
+#endif
 };
 
 CF_EXPORT CFDateIntervalFormatterRef CFDateIntervalFormatterCreate(CFAllocatorRef _Nullable allocator, CFLocaleRef _Nullable locale, CFDateIntervalFormatterStyle dateStyle, CFDateIntervalFormatterStyle timeStyle);

Foundation/DateIntervalFormatter.swift

@@ -17,8 +17,10 @@ internal let kCFDateIntervalFormatterLongStyle = CFDateIntervalFormatterStyle.lo
 internal let kCFDateIntervalFormatterFullStyle = CFDateIntervalFormatterStyle.fullStyle
 
 internal let kCFDateIntervalFormatterBoundaryStyleDefault = _CFDateIntervalFormatterBoundaryStyle.cfDateIntervalFormatterBoundaryStyleDefault
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 internal let kCFDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths = _CFDateIntervalFormatterBoundaryStyle.cfDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths
 #endif
+#endif
 
 extension DateIntervalFormatter {
     // Keep these in sync with CFDateIntervalFormatterStyle.
@@ -60,7 +62,9 @@ internal extension DateIntervalFormatter.BoundaryStyle {
     init(_ cfStyle: _CFDateIntervalFormatterBoundaryStyle) {
         switch cfStyle {
         case kCFDateIntervalFormatterBoundaryStyleDefault: self = .default
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
         case kCFDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths: self = .minimizeAdjacentMonths
+#endif
         default: fatalError()
         }
     }
@@ -70,7 +74,9 @@ internal extension _CFDateIntervalFormatterBoundaryStyle {
     init(_ style: DateIntervalFormatter.BoundaryStyle) {
         switch style {
         case .default: self = kCFDateIntervalFormatterBoundaryStyleDefault
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
         case .minimizeAdjacentMonths: self = kCFDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths
+#endif
         }
     }
 }
@@ -126,7 +132,9 @@ open class DateIntervalFormatter: Formatter {
 
     internal enum BoundaryStyle: UInt {
         case `default` = 0
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
         case minimizeAdjacentMonths = 1
+#endif
     }
 
     internal var boundaryStyle: BoundaryStyle {