Merge pull request swiftlang#23029 from compnerd/list-the-ways-that-everything-is-terrible

compnerd · web-flow · commit a19a62351d9d · 2019-03-01T21:22:41.000-08:00
stdlib: use the correct va_list type on Windows
diff --git a/stdlib/public/core/VarArgs.swift b/stdlib/public/core/VarArgs.swift
@@ -419,7 +419,7 @@ extension Float80 : CVarArg, _CVarArgAligned {
 }
 #endif
 
-#if arch(x86_64) || arch(s390x) || (arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows)))
+#if (arch(x86_64) && !os(Windows)) || arch(s390x) || (arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows)))
 
 /// An object that can manage the lifetime of storage backing a
 /// `CVaListPointer`.

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ extension Float80 : CVarArg, _CVarArgAligned {`
`419`	`419`	`}`
`420`	`420`	`#endif`
`421`	`421`
`422`		`-#if arch(x86_64) \|\| arch(s390x) \|\| (arch(arm64) && !(os(macOS) \|\| os(iOS) \|\| os(tvOS) \|\| os(watchOS) \|\| os(Windows)))`
	`422`	`+#if (arch(x86_64) && !os(Windows)) \|\| arch(s390x) \|\| (arch(arm64) && !(os(macOS) \|\| os(iOS) \|\| os(tvOS) \|\| os(watchOS) \|\| os(Windows)))`
`423`	`423`
`424`	`424`	`/// An object that can manage the lifetime of storage backing a`
`425`	`425`	/// `CVaListPointer`.