Merge pull request #3544 from compnerd/errno-cleanup

Author: swift-ci

stdlib/public/Platform/Misc.c

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <errno.h>
 #include <fcntl.h>
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <semaphore.h>
@@ -104,3 +105,14 @@ SWIFT_CC(swift) extern char **_swift_FreeBSD_getEnv() {
   return environ;
 }
 #endif // defined(__FreeBSD__)
+
+SWIFT_CC(swift)
+extern int _swift_Platform_getErrno() {
+  return errno;
+}
+
+SWIFT_CC(swift)
+extern void _swift_Platform_setErrno(int value) {
+  errno = value;
+}
+

stdlib/public/Platform/Platform.swift

@@ -94,36 +94,18 @@ public func || <T : Boolean>(
 // sys/errno.h
 //===----------------------------------------------------------------------===//
 
+@_silgen_name("_swift_Platform_getErrno")
+func _swift_Platform_getErrno() -> Int32
+
+@_silgen_name("_swift_Platform_setErrno")
+func _swift_Platform_setErrno(_: Int32)
+
 public var errno : Int32 {
   get {
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) || os(FreeBSD) || os(PS4)
-    return __error().pointee
-#elseif os(Android)
-    return __errno().pointee
-#elseif os(Windows)
-#if CYGWIN
-    return __errno().pointee
-#else
-    return _errno().pointee
-#endif
-#else
-    return __errno_location().pointee
-#endif
+    return _swift_Platform_getErrno()
   }
   set(val) {
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) || os(FreeBSD) || os(PS4)
-    return __error().pointee = val
-#elseif os(Android)
-    return __errno().pointee = val
-#elseif os(Windows)
-#if CYGWIN
-    return __errno().pointee = val
-#else
-    return _errno().pointee = val
-#endif
-#else
-    return __errno_location().pointee = val
-#endif
+    return _swift_Platform_setErrno(val)
   }
 }