[compiler-rt] r220519 - Appeasing an MSVC compile warning about "and"; NFC.

[Aaron Ballman]

Author: aaronballman
Date: Thu Oct 23 16:59:34 2014
New Revision: 220519

URL: http://llvm.org/viewvc/llvm-project?rev=220519&view=rev
Log:
Appeasing an MSVC compile warning about "and"; NFC.

Modified:
    compiler-rt/trunk/lib/asan/asan_report.cc

Modified: compiler-rt/trunk/lib/asan/asan_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=220519&r1=220518&r2=220519&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_report.cc Thu Oct 23 16:59:34 2014
@@ -441,7 +441,7 @@ bool DescribeAddressIfStack(uptr addr, u
   // 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.