Merge pull request #2375 from vgorloff/macos-to-android-crosscompile

compnerd · web-flow · commit 664c8a023aeb · 2019-06-23T22:28:40.000-07:00
[Android]: Fix for compile error addressed Float80 data type.
diff --git a/Foundation/CGFloat.swift b/Foundation/CGFloat.swift
@@ -31,7 +31,7 @@ public struct CGFloat {
         self.native = NativeType(value)
     }
     
-#if !os(Windows) && (arch(i386) || arch(x86_64))
+#if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64))
     @_transparent public init(_ value: Float80) {
         self.native = NativeType(value)
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public struct CGFloat {`
`31`	`31`	`self.native = NativeType(value)`
`32`	`32`	`}`
`33`	`33`
`34`		`-#if !os(Windows) && (arch(i386) \|\| arch(x86_64))`
	`34`	`+#if !(os(Windows) \|\| os(Android)) && (arch(i386) \|\| arch(x86_64))`
`35`	`35`	`@_transparent public init(_ value: Float80) {`
`36`	`36`	`self.native = NativeType(value)`
`37`	`37`	`}`