diff options
| author | Yaron Keren <yaron.keren@gmail.com> | 2014-12-04 21:46:50 +0000 |
|---|---|---|
| committer | Yaron Keren <yaron.keren@gmail.com> | 2014-12-04 21:46:50 +0000 |
| commit | 7fc6f1e7945c8f704df9f779c6d0ab0f010c8d12 (patch) | |
| tree | 11abb48710175efadb647daa8970f56611faf6f2 /clang/lib/Driver/MSVCToolChain.cpp | |
| parent | 6fd64ff577fab9a2f1d3f8383c6b3a95d543d9f6 (diff) | |
| download | bcm5719-llvm-7fc6f1e7945c8f704df9f779c6d0ab0f010c8d12.tar.gz bcm5719-llvm-7fc6f1e7945c8f704df9f779c6d0ab0f010c8d12.zip | |
Silence warning: "NOMINMAX" redefined.
llvm-svn: 223391
Diffstat (limited to 'clang/lib/Driver/MSVCToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/MSVCToolChain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Driver/MSVCToolChain.cpp b/clang/lib/Driver/MSVCToolChain.cpp index b822b7d57ce..d6bd5c31ae6 100644 --- a/clang/lib/Driver/MSVCToolChain.cpp +++ b/clang/lib/Driver/MSVCToolChain.cpp @@ -31,7 +31,9 @@ #ifdef USE_WIN32 #define WIN32_LEAN_AND_MEAN #define NOGDI - #define NOMINMAX + #ifndef NOMINMAX + #define NOMINMAX + #endif #include <windows.h> #endif |
