diff options
| author | Anna Zaks <ganna@apple.com> | 2015-11-20 20:18:06 +0000 |
|---|---|---|
| committer | Anna Zaks <ganna@apple.com> | 2015-11-20 20:18:06 +0000 |
| commit | cc03a2a24baaf51c1ae89e8b266f0bacd291f481 (patch) | |
| tree | d81dc355daae7b3b18bd7d066a59982c9cbfcb51 /lib/sanitizer_common/tests | |
| parent | 14e2fe9c5efa143f8ecbcd87c24ec81949c737fa (diff) | |
[compiler-rt] Do not pull in min and max macros from windows.h
This should fix Windows buildbot breakage triggered by r253690.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@253701 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/tests')
| -rw-r--r-- | lib/sanitizer_common/tests/sanitizer_libc_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sanitizer_common/tests/sanitizer_libc_test.cc b/lib/sanitizer_common/tests/sanitizer_libc_test.cc index b09d37352..015e32a09 100644 --- a/lib/sanitizer_common/tests/sanitizer_libc_test.cc +++ b/lib/sanitizer_common/tests/sanitizer_libc_test.cc @@ -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> |