From a44def276c67a2ee1784443df02d320d366b44d1 Mon Sep 17 00:00:00 2001 From: Anna Zaks Date: Fri, 20 Nov 2015 20:18:06 +0000 Subject: [PATCH] [compiler-rt] Do not pull in min and max macros from windows.h This should fix Windows buildbot breakage triggered by r253690. llvm-svn: 253701 --- compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cc index b09d373525d5..015e32a09e37 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cc @@ -16,7 +16,9 @@ #include "gtest/gtest.h" #if SANITIZER_WINDOWS +#define NOMINMAX #include +#undef NOMINMAX #endif #if SANITIZER_POSIX # include