From 29eec9a5203215443a36aea04bc6d3fbbebc31ef Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Thu, 23 Oct 2014 21:59:34 +0000 Subject: [PATCH] Appeasing an MSVC compile warning about "and"; NFC. llvm-svn: 220519 --- compiler-rt/lib/asan/asan_report.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/asan/asan_report.cc b/compiler-rt/lib/asan/asan_report.cc index 27f1d34..b42d9bc 100644 --- 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. -- 2.7.4