Merge pull request #2001 from compnerd/ill-put-you-on-my-calendar

millenomi · web-flow · commit 3a4e7fb2d534 · 2019-03-14T10:48:05.000-07:00
NSTimeZone: use the android path on Windows
diff --git a/Foundation/NSTimeZone.swift b/Foundation/NSTimeZone.swift
@@ -29,13 +29,17 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
     }
 
     public init?(name tzName: String, data aData: Data?) {
-#if os(Android)
+#if os(Android) || os(Windows)
         var tzName = tzName
         if tzName == "UTC" || tzName == "GMT" {
             tzName = "GMT+0000"
         }
         else if !(tzName.hasPrefix("GMT+") || tzName.hasPrefix("GMT-")) {
+#if os(Android)
             NSLog("Time zone database not available on Android")
+#else
+            NSLog("Time zone database not available on Windows")
+#endif
         }
 #endif
         super.init()

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,17 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public init?(name tzName: String, data aData: Data?) {`
`32`		`-#if os(Android)`
	`32`	`+#if os(Android) \|\| os(Windows)`
`33`	`33`	`var tzName = tzName`
`34`	`34`	`if tzName == "UTC" \|\| tzName == "GMT" {`
`35`	`35`	`tzName = "GMT+0000"`
`36`	`36`	`}`
`37`	`37`	`else if !(tzName.hasPrefix("GMT+") \|\| tzName.hasPrefix("GMT-")) {`
	`38`	`+#if os(Android)`
`38`	`39`	`NSLog("Time zone database not available on Android")`
	`40`	`+#else`
	`41`	`+ NSLog("Time zone database not available on Windows")`
	`42`	`+#endif`
`39`	`43`	`}`
`40`	`44`	`#endif`
`41`	`45`	`super.init()`