[compiler-rt] r253701 - [compiler-rt] Do not pull in min and max macros from windows.h

Anna Zaks via llvm-commits llvm-commits at lists.llvm.org
Fri Nov 20 12:18:06 PST 2015


Author: zaks
Date: Fri Nov 20 14:18:06 2015
New Revision: 253701

URL: http://llvm.org/viewvc/llvm-project?rev=253701&view=rev
Log:
[compiler-rt] Do not pull in min and max macros from windows.h

This should fix Windows buildbot breakage triggered by r253690.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_libc_test.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_libc_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_libc_test.cc?rev=253701&r1=253700&r2=253701&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_libc_test.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_libc_test.cc Fri Nov 20 14:18:06 2015
@@ -16,7 +16,9 @@
 #include "gtest/gtest.h"
 
 #if SANITIZER_WINDOWS
+#define NOMINMAX
 #include <windows.h>
+#undef NOMINMAX
 #endif
 #if SANITIZER_POSIX
 # include <sys/stat.h>




More information about the llvm-commits mailing list