r223391 - Silence warning: "NOMINMAX" redefined.

Yaron Keren yaron.keren at gmail.com
Thu Dec 4 13:46:51 PST 2014


Author: yrnkrn
Date: Thu Dec  4 15:46:50 2014
New Revision: 223391

URL: http://llvm.org/viewvc/llvm-project?rev=223391&view=rev
Log:
Silence warning: "NOMINMAX" redefined.


Modified:
    cfe/trunk/lib/Driver/MSVCToolChain.cpp

Modified: cfe/trunk/lib/Driver/MSVCToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=223391&r1=223390&r2=223391&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/MSVCToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/MSVCToolChain.cpp Thu Dec  4 15:46:50 2014
@@ -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
 





More information about the cfe-commits mailing list