Merge pull request #3036 from compnerd/win32-lean-and-mean

Author: swift-ci

include/swift/Runtime/MutexWin32.h

@@ -18,6 +18,8 @@
 #ifndef SWIFT_RUNTIME_MUTEX_WIN32_H
 #define SWIFT_RUNTIME_MUTEX_WIN32_H
 
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 
 namespace swift {

stdlib/public/runtime/CygwinPort.cpp

@@ -21,6 +21,9 @@
 #include <string.h>
 #include <mutex>
 #include <vector>
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #include <psapi.h>
 
@@ -148,4 +151,4 @@ void swift::_swift_once_f(uintptr_t *predicate, void *context,
   } else
     swiftOnceMutex.unlock();
 }
-#endif
+#endif

stdlib/public/runtime/Metadata.cpp

@@ -29,6 +29,7 @@
 #include <new>
 #include <cctype>
 #if defined(_MSC_VER)
+#define WIN32_LEAN_AND_MEAN
 // Avoid defining macro max(), min() which conflict with std::max(), std::min()
 #define NOMINMAX
 #include <windows.h>

stdlib/public/runtime/ProtocolConformance.cpp

@@ -30,6 +30,8 @@
 #endif
 
 #if defined(_MSC_VER)
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #else
 #include <dlfcn.h>

stdlib/public/stubs/Stubs.cpp

@@ -21,6 +21,7 @@
 #endif
 
 #if defined(_MSC_VER)
+#define WIN32_LEAN_AND_MEAN
 // Avoid defining macro max(), min() which conflict with std::max(), std::min()
 #define NOMINMAX
 #include <windows.h>

tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp

@@ -23,6 +23,8 @@
 #include <dispatch/dispatch.h>
 
 #ifdef LLVM_ON_WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #else
 #include <dlfcn.h>