Skip to content

Commit 933549b

Browse files
compnerdcompnerd
committed
Adjust enumerations for Windows
The enumeration types are imported like iOS on Windows due to a Microsoft extension. This causes a number of issues due to the type mapping code.
1 parent eccf284 commit 933549b

14 files changed

+20
-132
lines changed

‎Foundation/DateFormatter.swift

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ open class DateFormatter : Formatter {
1414
private var __cfObject: CFType?
1515
private var _cfObject: CFType {
1616
guard let obj = __cfObject else {
17-
#if os(macOS) || os(iOS)
18-
let dateStyle = CFDateFormatterStyle(rawValue: CFIndex(self.dateStyle.rawValue))!
19-
let timeStyle = CFDateFormatterStyle(rawValue: CFIndex(self.timeStyle.rawValue))!
20-
#else
21-
let dateStyle = CFDateFormatterStyle(self.dateStyle.rawValue)
22-
let timeStyle = CFDateFormatterStyle(self.timeStyle.rawValue)
23-
#endif
24-
17+
let dateStyle = CFDateFormatterStyle(rawValue: CFIndex(self.dateStyle.rawValue))!
18+
let timeStyle = CFDateFormatterStyle(rawValue: CFIndex(self.timeStyle.rawValue))!
19+
2520
let obj = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, dateStyle, timeStyle)!
2621
_setFormatterAttributes(obj)
2722
if let dateFormat = _dateFormat {

‎Foundation/ISO8601DateFormatter.swift

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ open class ISO8601DateFormatter : Formatter, NSSecureCoding {
5454
private var __cfObject: CFType?
5555
private var _cfObject: CFType {
5656
guard let obj = __cfObject else {
57-
#if os(macOS) || os(iOS)
58-
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
59-
#else
60-
let format = CFISO8601DateFormatOptions(self.formatOptions.rawValue)
61-
#endif
57+
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
6258
let obj = CFDateFormatterCreateISO8601Formatter(kCFAllocatorSystemDefault, format)!
6359
CFDateFormatterSetProperty(obj, kCFDateFormatterTimeZone, timeZone._cfObject)
6460
__cfObject = obj
@@ -101,13 +97,8 @@ open class ISO8601DateFormatter : Formatter, NSSecureCoding {
10197
}
10298

10399
open class func string(from date: Date, timeZone: TimeZone, formatOptions: ISO8601DateFormatter.Options = []) -> String {
104-
105-
#if os(macOS) || os(iOS)
106-
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
107-
#else
108-
let format = CFISO8601DateFormatOptions(formatOptions.rawValue)
109-
#endif
110-
100+
101+
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
111102
let obj = CFDateFormatterCreateISO8601Formatter(kCFAllocatorSystemDefault, format)
112103
CFDateFormatterSetProperty(obj, kCFDateFormatterTimeZone, timeZone._cfObject)
113104
return CFDateFormatterCreateStringWithDate(kCFAllocatorSystemDefault, obj, date._cfObject)._swiftObject

‎Foundation/NSCalendar.swift

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import CoreFoundation
1111

12-
#if canImport(ObjectiveC) // automatic CF_OPTIONS(…) OptionSet hoisting depends on the objc_fixed_enum attribute
1312
internal let kCFCalendarUnitEra = CFCalendarUnit.era
1413
internal let kCFCalendarUnitYear = CFCalendarUnit.year
1514
internal let kCFCalendarUnitMonth = CFCalendarUnit.month
@@ -34,26 +33,6 @@ internal let kCFDateFormatterShortStyle = CFDateFormatterStyle.shortStyle
3433
internal let kCFDateFormatterMediumStyle = CFDateFormatterStyle.mediumStyle
3534
internal let kCFDateFormatterLongStyle = CFDateFormatterStyle.longStyle
3635
internal let kCFDateFormatterFullStyle = CFDateFormatterStyle.fullStyle
37-
#else
38-
internal let kCFCalendarUnitEra = CFCalendarUnit(CoreFoundation.kCFCalendarUnitEra)
39-
internal let kCFCalendarUnitYear = CFCalendarUnit(CoreFoundation.kCFCalendarUnitYear)
40-
internal let kCFCalendarUnitMonth = CFCalendarUnit(CoreFoundation.kCFCalendarUnitMonth)
41-
internal let kCFCalendarUnitDay = CFCalendarUnit(CoreFoundation.kCFCalendarUnitDay)
42-
internal let kCFCalendarUnitHour = CFCalendarUnit(CoreFoundation.kCFCalendarUnitHour)
43-
internal let kCFCalendarUnitMinute = CFCalendarUnit(CoreFoundation.kCFCalendarUnitMinute)
44-
internal let kCFCalendarUnitSecond = CFCalendarUnit(CoreFoundation.kCFCalendarUnitSecond)
45-
internal let kCFCalendarUnitWeekday = CFCalendarUnit(CoreFoundation.kCFCalendarUnitWeekday)
46-
internal let kCFCalendarUnitWeekdayOrdinal = CFCalendarUnit(CoreFoundation.kCFCalendarUnitWeekdayOrdinal)
47-
internal let kCFCalendarUnitQuarter = CFCalendarUnit(CoreFoundation.kCFCalendarUnitQuarter)
48-
internal let kCFCalendarUnitWeekOfMonth = CFCalendarUnit(CoreFoundation.kCFCalendarUnitWeekOfMonth)
49-
internal let kCFCalendarUnitWeekOfYear = CFCalendarUnit(CoreFoundation.kCFCalendarUnitWeekOfYear)
50-
internal let kCFCalendarUnitYearForWeekOfYear = CFCalendarUnit(CoreFoundation.kCFCalendarUnitYearForWeekOfYear)
51-
internal let kCFCalendarUnitNanosecond = CFCalendarUnit(CoreFoundation.kCFCalendarUnitNanosecond)
52-
53-
internal func _CFCalendarUnitRawValue(_ unit: CFCalendarUnit) -> CFOptionFlags {
54-
return unit
55-
}
56-
#endif
5736

5837
extension NSCalendar {
5938
public struct Identifier : RawRepresentable, Equatable, Hashable, Comparable {
@@ -113,11 +92,7 @@ extension NSCalendar {
11392
public static let timeZone = Unit(rawValue: UInt(1 << 21))
11493

11594
internal var _cfValue: CFCalendarUnit {
116-
#if os(macOS) || os(iOS)
11795
return CFCalendarUnit(rawValue: self.rawValue)
118-
#else
119-
return CFCalendarUnit(self.rawValue)
120-
#endif
12196
}
12297
}
12398

‎Foundation/NSCharacterSet.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import CoreFoundation
1212

13-
#if os(macOS) || os(iOS)
1413
let kCFCharacterSetControl = CFCharacterSetPredefinedSet.control
1514
let kCFCharacterSetWhitespace = CFCharacterSetPredefinedSet.whitespace
1615
let kCFCharacterSetWhitespaceAndNewline = CFCharacterSetPredefinedSet.whitespaceAndNewline
@@ -26,7 +25,6 @@ let kCFCharacterSetCapitalizedLetter = CFCharacterSetPredefinedSet.capitalizedLe
2625
let kCFCharacterSetSymbol = CFCharacterSetPredefinedSet.symbol
2726
let kCFCharacterSetNewline = CFCharacterSetPredefinedSet.newline
2827
let kCFCharacterSetIllegal = CFCharacterSetPredefinedSet.illegal
29-
#endif
3028

3129

3230
open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {

‎Foundation/NSLocale.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,12 @@ extension NSLocale {
152152

153153
open class func characterDirection(forLanguage isoLangCode: String) -> NSLocale.LanguageDirection {
154154
let dir = CFLocaleGetLanguageCharacterDirection(isoLangCode._cfObject)
155-
#if os(macOS) || os(iOS)
156155
return NSLocale.LanguageDirection(rawValue: UInt(dir.rawValue))!
157-
#else
158-
return NSLocale.LanguageDirection(rawValue: UInt(dir))!
159-
#endif
160156
}
161157

162158
open class func lineDirection(forLanguage isoLangCode: String) -> NSLocale.LanguageDirection {
163159
let dir = CFLocaleGetLanguageLineDirection(isoLangCode._cfObject)
164-
#if os(macOS) || os(iOS)
165160
return NSLocale.LanguageDirection(rawValue: UInt(dir.rawValue))!
166-
#else
167-
return NSLocale.LanguageDirection(rawValue: UInt(dir))!
168-
#endif
169161
}
170162
}
171163

‎Foundation/NSNumber.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import CoreFoundation
1212

13-
#if os(macOS) || os(iOS)
1413
internal let kCFNumberSInt8Type = CFNumberType.sInt8Type
1514
internal let kCFNumberSInt16Type = CFNumberType.sInt16Type
1615
internal let kCFNumberSInt32Type = CFNumberType.sInt32Type
@@ -28,9 +27,6 @@ internal let kCFNumberCFIndexType = CFNumberType.cfIndexType
2827
internal let kCFNumberNSIntegerType = CFNumberType.nsIntegerType
2928
internal let kCFNumberCGFloatType = CFNumberType.cgFloatType
3029
internal let kCFNumberSInt128Type = CFNumberType(rawValue: 17)!
31-
#else
32-
internal let kCFNumberSInt128Type: CFNumberType = 17
33-
#endif
3430

3531
extension Int8 : _ObjectiveCBridgeable {
3632
@available(swift, deprecated: 4, renamed: "init(truncating:)")

‎Foundation/NSObjCRuntime.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010

1111
import CoreFoundation
1212

13-
#if os(macOS) || os(iOS)
1413
internal let kCFCompareLessThan = CFComparisonResult.compareLessThan
1514
internal let kCFCompareEqualTo = CFComparisonResult.compareEqualTo
1615
internal let kCFCompareGreaterThan = CFComparisonResult.compareGreaterThan
17-
#endif
1816

1917
internal enum _NSSimpleObjCType : UnicodeScalar {
2018
case ID = "@"

‎Foundation/NSRegularExpression.swift

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSCoding {
7777

7878
public init(pattern: String, options: Options = []) throws {
7979
var error: Unmanaged<CFError>?
80-
#if os(macOS) || os(iOS)
8180
let opt = _CFRegularExpressionOptions(rawValue: options.rawValue)
82-
#else
83-
let opt = _CFRegularExpressionOptions(options.rawValue)
84-
#endif
8581
if let regex = _CFRegularExpressionCreate(kCFAllocatorSystemDefault, pattern._cfObject, opt, &error) {
8682
_internal = regex
8783
} else {
@@ -94,11 +90,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSCoding {
9490
}
9591

9692
open var options: Options {
97-
#if os(macOS) || os(iOS)
9893
let opt = _CFRegularExpressionGetOptions(_internal).rawValue
99-
#else
100-
let opt = _CFRegularExpressionGetOptions(_internal)
101-
#endif
10294

10395
return Options(rawValue: opt)
10496
}
@@ -151,11 +143,7 @@ internal class _NSRegularExpressionMatcher {
151143

152144
internal func _NSRegularExpressionMatch(_ context: UnsafeMutableRawPointer?, ranges: UnsafeMutablePointer<CFRange>?, count: CFIndex, flags: _CFRegularExpressionMatchingFlags, stop: UnsafeMutablePointer<_DarwinCompatibleBoolean>) -> Void {
153145
let matcher = unsafeBitCast(context, to: _NSRegularExpressionMatcher.self)
154-
#if os(macOS) || os(iOS)
155146
let flags = NSRegularExpression.MatchingFlags(rawValue: flags.rawValue)
156-
#else
157-
let flags = NSRegularExpression.MatchingFlags(rawValue: flags)
158-
#endif
159147
let result = ranges?.withMemoryRebound(to: NSRange.self, capacity: count) { rangePtr in
160148
NSTextCheckingResult.regularExpressionCheckingResultWithRanges(rangePtr, count: count, regularExpression: matcher.regex)
161149
}
@@ -172,12 +160,8 @@ extension NSRegularExpression {
172160
public func enumerateMatches(in string: String, options: NSRegularExpression.MatchingOptions = [], range: NSRange, using block: @escaping (NSTextCheckingResult?, NSRegularExpression.MatchingFlags, UnsafeMutablePointer<ObjCBool>) -> Swift.Void) {
173161
let matcher = _NSRegularExpressionMatcher(regex: self, block: block)
174162
withExtendedLifetime(matcher) { (m: _NSRegularExpressionMatcher) -> Void in
175-
#if os(macOS) || os(iOS)
176-
let opts = _CFRegularExpressionMatchingOptions(rawValue: options.rawValue)
177-
#else
178-
let opts = _CFRegularExpressionMatchingOptions(options.rawValue)
179-
#endif
180-
_CFRegularExpressionEnumerateMatchesInString(_internal, string._cfObject, opts, CFRange(range), unsafeBitCast(matcher, to: UnsafeMutableRawPointer.self), _NSRegularExpressionMatch)
163+
let opts = _CFRegularExpressionMatchingOptions(rawValue: options.rawValue)
164+
_CFRegularExpressionEnumerateMatchesInString(_internal, string._cfObject, opts, CFRange(range), unsafeBitCast(matcher, to: UnsafeMutableRawPointer.self), _NSRegularExpressionMatch)
181165
}
182166
}
183167

‎Foundation/NSString.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func NSLocalizedString(_ key: String,
2828
return bundle.localizedString(forKey: key, value: value, table: tableName)
2929
}
3030

31-
#if os(macOS) || os(iOS)
3231
internal let kCFStringEncodingMacRoman = CFStringBuiltInEncodings.macRoman.rawValue
3332
internal let kCFStringEncodingWindowsLatin1 = CFStringBuiltInEncodings.windowsLatin1.rawValue
3433
internal let kCFStringEncodingISOLatin1 = CFStringBuiltInEncodings.isoLatin1.rawValue
@@ -53,8 +52,6 @@ internal let kCFStringNormalizationFormD = CFStringNormalizationForm.D
5352
internal let kCFStringNormalizationFormKD = CFStringNormalizationForm.KD
5453
internal let kCFStringNormalizationFormC = CFStringNormalizationForm.C
5554
internal let kCFStringNormalizationFormKC = CFStringNormalizationForm.KC
56-
57-
#endif
5855

5956
extension NSString {
6057

@@ -100,11 +97,7 @@ extension NSString {
10097
public static let regularExpression = CompareOptions(rawValue: 1024)
10198

10299
internal func _cfValue(_ fixLiteral: Bool = false) -> CFStringCompareFlags {
103-
#if os(macOS) || os(iOS)
104100
return contains(.literal) || !fixLiteral ? CFStringCompareFlags(rawValue: rawValue) : CFStringCompareFlags(rawValue: rawValue).union(.compareNonliteral)
105-
#else
106-
return contains(.literal) || !fixLiteral ? CFStringCompareFlags(rawValue) : CFStringCompareFlags(rawValue) | UInt(kCFCompareNonliteral)
107-
#endif
108101
}
109102
}
110103
}
@@ -301,7 +294,7 @@ open class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSC
301294
}
302295
if type(of: self) == NSString.self || type(of: self) == NSMutableString.self {
303296
if _storage._guts._isContiguousASCII {
304-
return UnsafePointer<Int8>(_storage._guts.startASCII);
297+
return UnsafePointer<Int8>(_storage._guts.startASCII)
305298
}
306299
}
307300
return nil
@@ -1196,7 +1189,7 @@ extension NSString {
11961189
guard let cf = data.withUnsafeBytes({ (bytes: UnsafePointer<UInt8>) -> CFString? in
11971190
return CFStringCreateWithBytes(kCFAllocatorDefault, bytes, data.count,
11981191
CFStringConvertNSStringEncodingToEncoding(numericCast(encoding)), true)
1199-
}) else { return nil }
1192+
}) else { return nil }
12001193

12011194
var str: String?
12021195
if String._conditionallyBridgeFromObjectiveC(cf._nsObject, result: &str) {

‎Foundation/NSTimeZone.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,7 @@ extension NSTimeZone {
248248
}
249249

250250
open func localizedName(_ style: NameStyle, locale: Locale?) -> String? {
251-
#if os(macOS) || os(iOS)
252-
let cfStyle = CFTimeZoneNameStyle(rawValue: style.rawValue)!
253-
#else
254-
let cfStyle = CFTimeZoneNameStyle(style.rawValue)
255-
#endif
251+
let cfStyle = CFTimeZoneNameStyle(rawValue: style.rawValue)!
256252
return CFTimeZoneCopyLocalizedName(self._cfObject, cfStyle, locale?._cfObject ?? CFLocaleCopyCurrent())._swiftObject
257253
}
258254

‎Foundation/NSURL.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010

1111
import CoreFoundation
1212

13-
#if os(macOS) || os(iOS)
1413
internal let kCFURLPOSIXPathStyle = CFURLPathStyle.cfurlposixPathStyle
1514
internal let kCFURLWindowsPathStyle = CFURLPathStyle.cfurlWindowsPathStyle
16-
#endif
1715

1816
private func _standardizedPath(_ path: String) -> String {
1917
if !path.absolutePath {

‎Foundation/NumberFormatter.swift

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ open class NumberFormatter : Formatter {
6262
if let obj = _currentCfFormatter {
6363
return obj
6464
} else {
65-
#if os(macOS) || os(iOS)
66-
let numberStyle = CFNumberFormatterStyle(rawValue: CFIndex(self.numberStyle.rawValue))!
67-
#else
68-
let numberStyle = CFNumberFormatterStyle(self.numberStyle.rawValue)
69-
#endif
65+
let numberStyle = CFNumberFormatterStyle(rawValue: CFIndex(self.numberStyle.rawValue))!
7066

7167
let obj = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, numberStyle)!
7268
_setFormatterAttributes(obj)
@@ -103,11 +99,7 @@ open class NumberFormatter : Formatter {
10399
var range = CFRange(location: 0, length: string.length)
104100
let number = withUnsafeMutablePointer(to: &range) { (rangePointer: UnsafeMutablePointer<CFRange>) -> NSNumber? in
105101

106-
#if os(macOS) || os(iOS)
107-
let parseOption = allowsFloats ? 0 : CFNumberFormatterOptionFlags.parseIntegersOnly.rawValue
108-
#else
109-
let parseOption = allowsFloats ? 0 : CFOptionFlags(kCFNumberFormatterParseIntegersOnly)
110-
#endif
102+
let parseOption = allowsFloats ? 0 : CFNumberFormatterOptionFlags.parseIntegersOnly.rawValue
111103
let result = CFNumberFormatterCreateNumberFromString(kCFAllocatorSystemDefault, _cfFormatter, string._cfObject, rangePointer, parseOption)
112104

113105
return result?._nsObject

‎Foundation/PropertyListSerialization.swift

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99

1010
import CoreFoundation
1111

12-
#if os(macOS) || os(iOS)
1312
let kCFPropertyListOpenStepFormat = CFPropertyListFormat.openStepFormat
1413
let kCFPropertyListXMLFormat_v1_0 = CFPropertyListFormat.xmlFormat_v1_0
1514
let kCFPropertyListBinaryFormat_v1_0 = CFPropertyListFormat.binaryFormat_v1_0
16-
#endif
1715

1816
extension PropertyListSerialization {
1917

@@ -39,23 +37,15 @@ extension PropertyListSerialization {
3937
open class PropertyListSerialization : NSObject {
4038

4139
open class func propertyList(_ plist: Any, isValidFor format: PropertyListFormat) -> Bool {
42-
#if os(macOS) || os(iOS)
4340
let fmt = CFPropertyListFormat(rawValue: CFIndex(format.rawValue))!
44-
#else
45-
let fmt = CFPropertyListFormat(format.rawValue)
46-
#endif
4741
let plistObj = __SwiftValue.store(plist)
4842
return CFPropertyListIsValid(plistObj, fmt)
4943
}
5044

5145
open class func data(fromPropertyList plist: Any, format: PropertyListFormat, options opt: WriteOptions) throws -> Data {
5246
var error: Unmanaged<CFError>? = nil
5347
let result = withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> CFData? in
54-
#if os(macOS) || os(iOS)
5548
let fmt = CFPropertyListFormat(rawValue: CFIndex(format.rawValue))!
56-
#else
57-
let fmt = CFPropertyListFormat(format.rawValue)
58-
#endif
5949
let options = CFOptionFlags(opt)
6050
let plistObj = __SwiftValue.store(plist)
6151
let d = CFPropertyListCreateData(kCFAllocatorSystemDefault, plistObj, fmt, options, outErr)
@@ -76,11 +66,7 @@ open class PropertyListSerialization : NSObject {
7666
return unsafeBitCast(CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)
7767
}
7868
}
79-
#if os(macOS) || os(iOS)
8069
format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!
81-
#else
82-
format?.pointee = PropertyListFormat(rawValue: UInt(fmt))!
83-
#endif
8470
if let err = error {
8571
throw err.takeUnretainedValue()._nsObject
8672
} else {
@@ -96,11 +82,7 @@ open class PropertyListSerialization : NSObject {
9682
return unsafeBitCast(CFPropertyListCreateWithStream(kCFAllocatorSystemDefault, stream, 0, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)
9783
}
9884
}
99-
#if os(macOS) || os(iOS)
10085
format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!
101-
#else
102-
format?.pointee = PropertyListFormat(rawValue: UInt(fmt))!
103-
#endif
10486
if let err = error {
10587
throw err.takeUnretainedValue()._nsObject
10688
} else {

‎Foundation/RunLoop.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99

1010
import CoreFoundation
1111

12-
#if os(macOS) || os(iOS)
13-
internal let kCFRunLoopEntry = CFRunLoopActivity.entry.rawValue
14-
internal let kCFRunLoopBeforeTimers = CFRunLoopActivity.beforeTimers.rawValue
15-
internal let kCFRunLoopBeforeSources = CFRunLoopActivity.beforeSources.rawValue
16-
internal let kCFRunLoopBeforeWaiting = CFRunLoopActivity.beforeWaiting.rawValue
17-
internal let kCFRunLoopAfterWaiting = CFRunLoopActivity.afterWaiting.rawValue
18-
internal let kCFRunLoopExit = CFRunLoopActivity.exit.rawValue
19-
internal let kCFRunLoopAllActivities = CFRunLoopActivity.allActivities.rawValue
20-
#endif
12+
internal let kCFRunLoopEntry = CFRunLoopActivity.entry.rawValue
13+
internal let kCFRunLoopBeforeTimers = CFRunLoopActivity.beforeTimers.rawValue
14+
internal let kCFRunLoopBeforeSources = CFRunLoopActivity.beforeSources.rawValue
15+
internal let kCFRunLoopBeforeWaiting = CFRunLoopActivity.beforeWaiting.rawValue
16+
internal let kCFRunLoopAfterWaiting = CFRunLoopActivity.afterWaiting.rawValue
17+
internal let kCFRunLoopExit = CFRunLoopActivity.exit.rawValue
18+
internal let kCFRunLoopAllActivities = CFRunLoopActivity.allActivities.rawValue
2119

2220
extension RunLoop {
2321
public struct Mode : RawRepresentable, Equatable, Hashable {

0 commit comments

Comments
 (0)