Merge pull request #1902 from compnerd/changes-of-the-future-past

swift-ci · web-flow · commit 851487ee691c · 2019-02-12T16:12:14.000-08:00
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
@@ -493,7 +493,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
     
     open var password: String? {
         let absoluteURL = CFURLCopyAbsoluteURL(_cfObject)
-#if os(Linux) || os(Android) || CYGWIN
+#if os(Linux) || os(Android) || os(Windows)
         let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, kCFURLComponentPassword, nil)
 #else
         let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, .password, nil)
diff --git a/Foundation/Stream.swift b/Foundation/Stream.swift
@@ -153,11 +153,7 @@ open class InputStream: Stream {
     }
     
     open override var streamStatus: Status {
-#if os(Windows)
-        return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream).rawValue))!
-#else
         return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream)))!
-#endif
     }
     
     open override var streamError: Error? {
@@ -209,11 +205,7 @@ open class OutputStream : Stream {
     }
     
     open override var streamStatus: Status {
-#if os(Windows)
-        return Stream.Status(rawValue: UInt(CFWriteStreamGetStatus(_stream).rawValue))!
-#else
         return Stream.Status(rawValue: UInt(CFWriteStreamGetStatus(_stream)))!
-#endif
     }
     
     open class func toMemory() -> Self {

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,7 @@ open class InputStream: Stream {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`open override var streamStatus: Status {`
`156`		`-#if os(Windows)`
`157`		`- return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream).rawValue))!`
`158`		`-#else`
`159`	`156`	`return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream)))!`
`160`		`-#endif`
`161`	`157`	`}`
`162`	`158`
`163`	`159`	`open override var streamError: Error? {`
`@@ -209,11 +205,7 @@ open class OutputStream : Stream {`
`209`	`205`	`}`
`210`	`206`
`211`	`207`	`open override var streamStatus: Status {`
`212`		`-#if os(Windows)`
`213`		`- return Stream.Status(rawValue: UInt(CFWriteStreamGetStatus(_stream).rawValue))!`
`214`		`-#else`
`215`	`208`	`return Stream.Status(rawValue: UInt(CFWriteStreamGetStatus(_stream)))!`
`216`		`-#endif`
`217`	`209`	`}`
`218`	`210`
`219`	`211`	`open class func toMemory() -> Self {`