Skip to content

Commit 1cfe66e

Browse files
compnerdcompnerd
authored
Merge pull request #2513 from gmittert/ImportEnums
Enable Enum Imports and Synchronize Paths
2 parents 7ce887d + 8852c10 commit 1cfe66e

19 files changed

+21
-150
lines changed

‎CoreFoundation/Base.subproj/CFAvailability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
#endif
124124

125125
#define __CF_ENUM_GET_MACRO(_1, _2, NAME, ...) NAME
126-
#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum))
126+
#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && (__has_feature(objc_fixed_enum) || __has_extension(cxx_fixed_enum)))
127127
#define __CF_NAMED_ENUM(_type, _name) enum __CF_ENUM_ATTRIBUTES _name : _type _name; enum _name : _type
128128
#define __CF_ANON_ENUM(_type) enum __CF_ENUM_ATTRIBUTES : _type
129129
#define CF_CLOSED_ENUM(_type, _name) enum __CF_CLOSED_ENUM_ATTRIBUTES _name : _type _name; enum _name : _type

‎CoreFoundation/Locale.subproj/CFDateComponents.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ CF_IMPLICIT_BRIDGING_ENABLED
1616
CF_EXTERN_C_BEGIN
1717
CF_ASSUME_NONNULL_BEGIN
1818

19+
// Must match NSDateComponentUndefined
1920
CF_ENUM(CFIndex) {
20-
CFDateComponentUndefined = __LONG_MAX__ // Must match NSDateComponentUndefined
21+
#if TARGET_OS_WIN32
22+
CFDateComponentUndefined = LLONG_MAX
23+
#else
24+
CFDateComponentUndefined = __LONG_MAX__
25+
#endif
2126
};
2227

2328
enum {

‎Foundation/DateFormatter.swift

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@ 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
17+
let dateStyle = CFDateFormatterStyle(rawValue: CFIndex(self.dateStyle.rawValue))!
18+
let timeStyle = CFDateFormatterStyle(rawValue: CFIndex(self.timeStyle.rawValue))!
2419

2520
let obj = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, dateStyle, timeStyle)!
2621
_setFormatterAttributes(obj)

‎Foundation/DateIntervalFormatter.swift

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

1010
import CoreFoundation
1111

12-
#if _runtime(_ObjC)
1312
internal let kCFDateIntervalFormatterNoStyle = CFDateIntervalFormatterStyle.noStyle
1413
internal let kCFDateIntervalFormatterShortStyle = CFDateIntervalFormatterStyle.shortStyle
1514
internal let kCFDateIntervalFormatterMediumStyle = CFDateIntervalFormatterStyle.mediumStyle
@@ -20,7 +19,6 @@ internal let kCFDateIntervalFormatterBoundaryStyleDefault = _CFDateIntervalForma
2019
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
2120
internal let kCFDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths = _CFDateIntervalFormatterBoundaryStyle.cfDateIntervalFormatterBoundaryStyleMinimizeAdjacentMonths
2221
#endif
23-
#endif
2422

2523
extension DateIntervalFormatter {
2624
// Keep these in sync with CFDateIntervalFormatterStyle.

‎Foundation/ISO8601DateFormatter.swift

Lines changed: 2 additions & 13 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
@@ -137,17 +133,10 @@ open class ISO8601DateFormatter : Formatter, NSSecureCoding {
137133
}
138134

139135
open class func string(from date: Date, timeZone: TimeZone, formatOptions: ISO8601DateFormatter.Options = []) -> String {
140-
141-
#if os(macOS) || os(iOS)
142-
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
143-
#else
144-
let format = CFISO8601DateFormatOptions(formatOptions.rawValue)
145-
#endif
146-
136+
let format = CFISO8601DateFormatOptions(rawValue: formatOptions.rawValue)
147137
let obj = CFDateFormatterCreateISO8601Formatter(kCFAllocatorSystemDefault, format)
148138
CFDateFormatterSetProperty(obj, kCFDateFormatterTimeZone, timeZone._cfObject)
149139
return CFDateFormatterCreateStringWithDate(kCFAllocatorSystemDefault, obj, date._cfObject)._swiftObject
150-
151140
}
152141

153142
private func _reset() {

‎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 {
@@ -109,11 +88,7 @@ extension NSCalendar {
10988
public static let timeZone = Unit(rawValue: UInt(1 << 21))
11089

11190
internal var _cfValue: CFCalendarUnit {
112-
#if os(macOS) || os(iOS)
11391
return CFCalendarUnit(rawValue: self.rawValue)
114-
#else
115-
return CFCalendarUnit(self.rawValue)
116-
#endif
11792
}
11893
}
11994

‎Foundation/NSCharacterSet.swift

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

1111
import CoreFoundation
1212

13-
#if _runtime(_ObjC) // if objc_enum works, restore the old names:
1413
let kCFCharacterSetControl = CFCharacterSetPredefinedSet.control
1514
let kCFCharacterSetWhitespace = CFCharacterSetPredefinedSet.whitespace
1615
let kCFCharacterSetWhitespaceAndNewline = CFCharacterSetPredefinedSet.whitespaceAndNewline
@@ -32,27 +31,18 @@ let kCFCharacterSetKeyedCodingTypeBuiltin = CFCharacterSetKeyedCodingType.builti
3231
let kCFCharacterSetKeyedCodingTypeRange = CFCharacterSetKeyedCodingType.range
3332
let kCFCharacterSetKeyedCodingTypeString = CFCharacterSetKeyedCodingType.string
3433
let kCFCharacterSetKeyedCodingTypeBuiltinAndBitmap = CFCharacterSetKeyedCodingType.builtinAndBitmap
35-
#endif
3634

37-
#if _runtime(_ObjC)
3835
fileprivate let lastKnownPredefinedCharacterSetConstant = kCFCharacterSetNewline.rawValue
3936

4037
fileprivate extension Int {
4138
init(_ predefinedSet: CFCharacterSetPredefinedSet) {
4239
self = predefinedSet.rawValue
4340
}
4441
}
45-
#else
46-
fileprivate let lastKnownPredefinedCharacterSetConstant = kCFCharacterSetNewline
47-
#endif
4842

4943
fileprivate func knownPredefinedCharacterSet(rawValue: Int) -> CFCharacterSetPredefinedSet? {
5044
if rawValue > 0 && rawValue <= lastKnownPredefinedCharacterSetConstant {
51-
#if _runtime(_ObjC)
5245
return CFCharacterSetPredefinedSet(rawValue: rawValue)
53-
#else
54-
return CFCharacterSetPredefinedSet(rawValue)
55-
#endif
5646
} else {
5747
return nil
5848
}
@@ -70,7 +60,6 @@ fileprivate extension String {
7060
static let characterSetNewIsInvertedKey = "NSIsInverted2"
7161
}
7262

73-
7463
open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
7564
typealias CFType = CFCharacterSet
7665
private var _base = _CFInfo(typeID: CFCharacterSetGetTypeID())

‎Foundation/NSLocale.swift

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

151151
open class func characterDirection(forLanguage isoLangCode: String) -> NSLocale.LanguageDirection {
152152
let dir = CFLocaleGetLanguageCharacterDirection(isoLangCode._cfObject)
153-
#if os(macOS) || os(iOS)
154153
return NSLocale.LanguageDirection(rawValue: UInt(dir.rawValue))!
155-
#else
156-
return NSLocale.LanguageDirection(rawValue: UInt(dir))!
157-
#endif
158154
}
159155

160156
open class func lineDirection(forLanguage isoLangCode: String) -> NSLocale.LanguageDirection {
161157
let dir = CFLocaleGetLanguageLineDirection(isoLangCode._cfObject)
162-
#if os(macOS) || os(iOS)
163158
return NSLocale.LanguageDirection(rawValue: UInt(dir.rawValue))!
164-
#else
165-
return NSLocale.LanguageDirection(rawValue: UInt(dir))!
166-
#endif
167159
}
168160
}
169161

‎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: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSSecureCoding {
8080

8181
public init(pattern: String, options: Options = []) throws {
8282
var error: Unmanaged<CFError>?
83-
#if os(macOS) || os(iOS)
8483
let opt = _CFRegularExpressionOptions(rawValue: options.rawValue)
85-
#else
86-
let opt = _CFRegularExpressionOptions(options.rawValue)
87-
#endif
8884
if let regex = _CFRegularExpressionCreate(kCFAllocatorSystemDefault, pattern._cfObject, opt, &error) {
8985
_internal = regex
9086
} else {
@@ -97,11 +93,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSSecureCoding {
9793
}
9894

9995
open var options: Options {
100-
#if os(macOS) || os(iOS)
10196
let opt = _CFRegularExpressionGetOptions(_internal).rawValue
102-
#else
103-
let opt = _CFRegularExpressionGetOptions(_internal)
104-
#endif
10597

10698
return Options(rawValue: opt)
10799
}
@@ -158,11 +150,7 @@ internal class _NSRegularExpressionMatcher {
158150

159151
internal func _NSRegularExpressionMatch(_ context: UnsafeMutableRawPointer?, ranges: UnsafeMutablePointer<CFRange>?, count: CFIndex, flags: _CFRegularExpressionMatchingFlags, stop: UnsafeMutablePointer<_DarwinCompatibleBoolean>) -> Void {
160152
let matcher = unsafeBitCast(context, to: _NSRegularExpressionMatcher.self)
161-
#if os(macOS) || os(iOS)
162153
let flags = NSRegularExpression.MatchingFlags(rawValue: flags.rawValue)
163-
#else
164-
let flags = NSRegularExpression.MatchingFlags(rawValue: flags)
165-
#endif
166154
let result = ranges?.withMemoryRebound(to: NSRange.self, capacity: count) { rangePtr in
167155
NSTextCheckingResult.regularExpressionCheckingResult(ranges: rangePtr, count: count, regularExpression: matcher.regex)
168156
}
@@ -179,11 +167,7 @@ extension NSRegularExpression {
179167
public func enumerateMatches(in string: String, options: NSRegularExpression.MatchingOptions = [], range: NSRange, using block: @escaping (NSTextCheckingResult?, NSRegularExpression.MatchingFlags, UnsafeMutablePointer<ObjCBool>) -> Swift.Void) {
180168
let matcher = _NSRegularExpressionMatcher(regex: self, block: block)
181169
withExtendedLifetime(matcher) { (m: _NSRegularExpressionMatcher) -> Void in
182-
#if os(macOS) || os(iOS)
183170
let opts = _CFRegularExpressionMatchingOptions(rawValue: options.rawValue)
184-
#else
185-
let opts = _CFRegularExpressionMatchingOptions(options.rawValue)
186-
#endif
187171
_CFRegularExpressionEnumerateMatchesInString(_internal, string._cfObject, opts, CFRange(range), unsafeBitCast(matcher, to: UnsafeMutableRawPointer.self), _NSRegularExpressionMatch)
188172
}
189173
}

‎Foundation/NSString.swift

Lines changed: 0 additions & 7 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

@@ -105,11 +102,7 @@ extension NSString {
105102
public static let regularExpression = CompareOptions(rawValue: 1024)
106103

107104
internal func _cfValue(_ fixLiteral: Bool = false) -> CFStringCompareFlags {
108-
#if os(macOS) || os(iOS)
109105
return contains(.literal) || !fixLiteral ? CFStringCompareFlags(rawValue: rawValue) : CFStringCompareFlags(rawValue: rawValue).union(.compareNonliteral)
110-
#else
111-
return contains(.literal) || !fixLiteral ? CFStringCompareFlags(rawValue) : CFStringCompareFlags(rawValue) | UInt(kCFCompareNonliteral)
112-
#endif
113106
}
114107
}
115108
}

‎Foundation/NSTimeZone.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,7 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
246246
}
247247

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

‎Foundation/NSURL.swift

Lines changed: 0 additions & 6 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
#if canImport(Darwin)
1917
import Darwin
@@ -524,11 +522,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
524522

525523
open var password: String? {
526524
let absoluteURL = CFURLCopyAbsoluteURL(_cfObject)
527-
#if os(Linux) || os(Android) || os(Windows)
528-
let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, kCFURLComponentPassword, nil)
529-
#else
530525
let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, .password, nil)
531-
#endif
532526
guard passwordRange.location != kCFNotFound else {
533527
return nil
534528
}

‎Foundation/NumberFormatter.swift

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

1010
import CoreFoundation
1111

12-
1312
extension NumberFormatter {
1413
public enum Style : UInt {
1514
case none = 0
@@ -50,11 +49,7 @@ open class NumberFormatter : Formatter {
5049
if let obj = _currentCfFormatter {
5150
return obj
5251
} else {
53-
#if os(macOS) || os(iOS)
54-
let numberStyle = CFNumberFormatterStyle(rawValue: CFIndex(self.numberStyle.rawValue))!
55-
#else
56-
let numberStyle = CFNumberFormatterStyle(self.numberStyle.rawValue)
57-
#endif
52+
let numberStyle = CFNumberFormatterStyle(rawValue: CFIndex(self.numberStyle.rawValue))!
5853

5954
let obj = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, numberStyle)!
6055
_setFormatterAttributes(obj)
@@ -98,11 +93,7 @@ open class NumberFormatter : Formatter {
9893
var range = CFRange(location: 0, length: string.length)
9994
let number = withUnsafeMutablePointer(to: &range) { (rangePointer: UnsafeMutablePointer<CFRange>) -> NSNumber? in
10095

101-
#if os(macOS) || os(iOS)
102-
let parseOption = allowsFloats ? 0 : CFNumberFormatterOptionFlags.parseIntegersOnly.rawValue
103-
#else
104-
let parseOption = allowsFloats ? 0 : CFOptionFlags(kCFNumberFormatterParseIntegersOnly)
105-
#endif
96+
let parseOption = allowsFloats ? 0 : CFNumberFormatterOptionFlags.parseIntegersOnly.rawValue
10697
let result = CFNumberFormatterCreateNumberFromString(kCFAllocatorSystemDefault, _cfFormatter, string._cfObject, rangePointer, parseOption)
10798

10899
return result?._nsObject

‎Foundation/Process.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ private var managerThreadRunLoop : RunLoop? = nil
4444
private var managerThreadRunLoopIsRunning = false
4545
private var managerThreadRunLoopIsRunningCondition = NSCondition()
4646

47-
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
4847
internal let kCFSocketNoCallBack: CFOptionFlags = 0 // .noCallBack cannot be used because empty option flags are imported as unavailable.
4948
internal let kCFSocketAcceptCallBack = CFSocketCallBackType.acceptCallBack.rawValue
5049
internal let kCFSocketDataCallBack = CFSocketCallBackType.dataCallBack.rawValue
@@ -58,7 +57,6 @@ extension CFSocketError {
5857
self.init(rawValue: value)
5958
}
6059
}
61-
#endif
6260

6361
#if !canImport(Darwin) && !os(Windows)
6462
private func findMaximumOpenFromProcSelfFD() -> CInt? {

0 commit comments

Comments
 (0)