Switch order of _WIN64/_WIN32 checks in computation of C types for Int/UInt

64-bit Windows defines both _WIN64 and _WIN32, so the logic here would
always end up defining 32-bit C types for Swift's `Int` and `UInt`.
Fix the ordering to check for 64-bit first, then 32-bit second.

Note that the SwiftShims version of this code has always been wrong,
but it's completely benign because SwiftShims is only used in the
Swift runtime itself, which is built with Clang (on all platforms),
and doesn't need to go through this code path. Still, we fix it in both
places, so we don't get a nasty surprise if the SwiftShims version of
the header later gets included in a non-Clang C++ compiler.

Author: DougGregor

include/swift/Basic/CBasicBridging.h

@@ -64,12 +64,12 @@ typedef unsigned __INT32_TYPE__ __swiftc_uint32_t;
 #define __swiftc_uintn_t(n) __swiftc_join3(__swiftc_uint, n, _t)
 
 #if defined(_MSC_VER) && !defined(__clang__)
-#if defined(_WIN32)
-typedef __swiftc_int32_t SwiftInt;
-typedef __swiftc_uint32_t SwiftUInt;
-#elif defined(_WIN64)
+#if defined(_WIN64)
 typedef __swiftc_int64_t SwiftInt;
 typedef __swiftc_uint64_t SwiftUInt;
+#elif defined(_WIN32)
+typedef __swiftc_int32_t SwiftInt;
+typedef __swiftc_uint32_t SwiftUInt;
 #else
 #error unknown windows pointer width
 #endif

stdlib/public/SwiftShims/swift/shims/SwiftStdint.h

@@ -71,12 +71,12 @@ typedef unsigned __INT8_TYPE__ __swift_uint8_t;
 #define __swift_uintn_t(n) __swift_join3(__swift_uint, n, _t)
 
 #if defined(_MSC_VER) && !defined(__clang__)
-#if defined(_WIN32)
-typedef __swift_int32_t __swift_intptr_t;
-typedef __swift_uint32_t __swift_uintptr_t;
-#elif defined(_WIN64)
+#if defined(_WIN64)
 typedef __swift_int64_t __swift_intptr_t;
 typedef __swift_uint64_t __swift_uintptr_t;
+#elif defined(_WIN32)
+typedef __swift_int32_t __swift_intptr_t;
+typedef __swift_uint32_t __swift_uintptr_t;
 #else
 #error unknown windows pointer width
 #endif