Appeasing an MSVC compile warning about "and"; NFC.

llvm-svn: 220519

diff --git a/compiler-rt/lib/asan/asan_report.cc b/compiler-rt/lib/asan/asan_report.cc
index 27f1d34..b42d9bc 100644 (file)
--- a/compiler-rt/lib/asan/asan_report.cc
+++ b/compiler-rt/lib/asan/asan_report.cc
@@ -441,7 +441,7 @@ bool DescribeAddressIfStack(uptr addr, uptr access_size) {
   // especially given that the alloca may be from entirely different place
   // (e.g. use-after-scope, or different thread's stack).
   StackTrace alloca_stack;
-#if defined(__powerpc64__) and defined(__BIG_ENDIAN__)
+#if defined(__powerpc64__) && defined(__BIG_ENDIAN__)
   // On PowerPC64 ELFv1, the address of a function actually points to a
   // three-doubleword data structure with the first field containing
   // the address of the function's code.