commit 9cef8874ec046db3ba4784d4b2a2e608466f7d0c
author Michael J. Spencer <bigcheesegs@gmail.com> Sat Nov 05 00:46:46 2011 +0000
committer Michael J. Spencer <bigcheesegs@gmail.com> Sat Nov 05 00:46:46 2011 +0000
tree 0fbec7800b51200d3b02814b4dcaf51be2af455b
parent 22508f410b3d727d5c557af3304c0a1bad94999e

Fix MSVC build.

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

lib/Driver/ToolChains.cpp

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 9e34b02..8083fe0 100644
--- 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;
@@ -2182,7 +2184,7 @@
     path = vsIDEInstallDir;
     return true;
   }
-  
+
   if (hasVCExpressDir && vsExpressIDEInstallDir[0]) {
     char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE");
     if (p)