Merge r143770 from mainline to fix MSVC build.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@144894 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index ee7ded94d4dbdf8825554d274148cc0c0e1428d9..ac63a2dfbb4e1fdc69d8de0772384ba4330a5245 100644 (file)
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -21,5 +21,13 @@ add_clang_library(clangDriver
   Types.cpp
   )
 
+IF(MSVC)
+  get_target_property(NON_ANSI_COMPILE_FLAGS clangDriver COMPILE_FLAGS)
+  string(REPLACE /Za
+    "" NON_ANSI_COMPILE_FLAGS
+    ${NON_ANSI_COMPILE_FLAGS})
+  set_target_properties(clangDriver PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
+ENDIF(MSVC)
+
 add_dependencies(clangDriver ClangAttrList ClangDiagnosticDriver
                  ClangDriverOptions ClangCC1Options ClangCC1AsOptions)

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 40149269f00438bbeff799c9d17a77bf905e8c2d..eb730e53cac3f53e46a0ce52348e56e2f09e33ea 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -44,7 +44,9 @@
 // environment.
 #ifdef _MSC_VER
   #define WIN32_LEAN_AND_MEAN 1
-  #include <windows.h>
+  #include <Windows.h>
+  #undef min
+  #undef max
 #endif
 
 using namespace clang::driver;
@@ -2334,7 +2336,7 @@ static bool getVisualStudioDir(std::string &path) {
     path = vsIDEInstallDir;
     return true;
   }
-  
+
   if (hasVCExpressDir && vsExpressIDEInstallDir[0]) {
     char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE");
     if (p)