Merge pull request #13235 from troughton/windows-errno-stdlibopen

Author: swift-ci

stdlib/public/SwiftShims/LibcShims.h

@@ -53,6 +53,8 @@ typedef      long int __swift_ssize_t;
 typedef __swift_uint32_t __swift_mode_t;
 #elif defined(__APPLE__)
 typedef __swift_uint16_t __swift_mode_t;
+#elif defined(_WIN32)
+typedef __swift_int32_t __swift_mode_t;
 #else  // just guessing
 typedef __swift_uint16_t __swift_mode_t;
 #endif
@@ -128,12 +130,10 @@ char * _Nullable *_stdlib_getEnviron();
 #endif
 
 // System error numbers <errno.h>
-#if !defined(_WIN32) || defined(__CYGWIN__)
 SWIFT_RUNTIME_STDLIB_INTERNAL
 int _stdlib_getErrno();
 SWIFT_RUNTIME_STDLIB_INTERNAL
 void _stdlib_setErrno(int value);
-#endif
 
 // Non-standard extensions
 SWIFT_READNONE SWIFT_RUNTIME_STDLIB_INTERNAL

stdlib/public/stubs/LibcShims.cpp

@@ -120,8 +120,8 @@ int swift::_stdlib_close(int fd) {
 // Windows
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
-int swift::_stdlib_open(const char *path, int oflag, int mode) {
-  return _open(path, oflag, mode);
+int swift::_stdlib_open(const char *path, int oflag, __swift_mode_t mode) {
+  return _open(path, oflag, static_cast<int>(mode));
 }
 
 #else
@@ -183,6 +183,8 @@ char * _Nullable *swift::_stdlib_getEnviron() {
 }
 #endif
 
+#endif // !(defined(_WIN32) && !defined(__CYGWIN__))
+
 SWIFT_RUNTIME_STDLIB_INTERNAL
 int swift::_stdlib_getErrno() {
   return errno;
@@ -193,8 +195,6 @@ void swift::_stdlib_setErrno(int value) {
   errno = value;
 }
 
-// not Windows
-#endif
 
 
 #if defined(__APPLE__)