diff options
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9e34b0288c..8083fe075f 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 @@ static bool getVisualStudioDir(std::string &path) { path = vsIDEInstallDir; return true; } - + if (hasVCExpressDir && vsExpressIDEInstallDir[0]) { char *p = (char*)strstr(vsExpressIDEInstallDir, "\\Common7\\IDE"); if (p) |