A couple of Win32 fixes.

rdar://103071801

Author: al45tair

include/swift/Threading/Impl/Win32/Win32Defs.h

@@ -47,8 +47,7 @@ typedef struct _RTL_CONDITION_VARIABLE *PRTL_CONDITION_VARIABLE;
 typedef PRTL_CONDITION_VARIABLE PCONDITION_VARIABLE;
 
 // These have to be #defines, to avoid problems with <windows.h>
-#define RTL_SRWLOCK_INIT                                                       \
-  { 0 }
+#define RTL_SRWLOCK_INIT {0}
 #define SRWLOCK_INIT RTL_SRWLOCK_INIT
 #define FLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF)
 

stdlib/public/runtime/Win32.cpp

@@ -68,7 +68,7 @@ swift::_swift_wideFromUTF8(const char *str) {
   }
 
   result = reinterpret_cast<wchar_t *>(std::malloc(len * sizeof(wchar_t)));
-  if (!reuslt) {
+  if (!result) {
     swift::fatalError(0, "unable to allocate space to convert '%s': %d\n",
                       str, errno);
   }
@@ -85,6 +85,4 @@ swift::_swift_wideFromUTF8(const char *str) {
   return result;
 }
 
-} // namespace swift
-
 #endif // defined(_WIN32)

test/Runtime/Paths.cpp

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #if defined(_WIN32) && !defined(__CYGWIN)
-#define stat(x) _stat(x)
+#define stat(p,s) _stat(p,s)
 #define S_IFDIR _S_IFDIR
 #endif