[llvm-commits] [compiler-rt] r153332 - /compiler-rt/trunk/lib/asan/tests/asan_test.cc

[Timur Iskhodzhanov]

Author: timurrrr
Date: Fri Mar 23 07:21:47 2012
New Revision: 153332

URL: http://llvm.org/viewvc/llvm-project?rev=153332&view=rev
Log:
[ASan] replace '#if ... or ...' with '#if ... || ...'

Modified:
    compiler-rt/trunk/lib/asan/tests/asan_test.cc

Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=153332&r1=153331&r2=153332&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Fri Mar 23 07:21:47 2012
@@ -20,7 +20,7 @@
 #include <setjmp.h>
 #include <assert.h>
 
-#if defined(__i386__) or defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__)
 #include <emmintrin.h>
 #endif
 
@@ -777,7 +777,7 @@
   pthread_join(t, 0);
 }
 
-#if defined(__i386__) or defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__)
 TEST(AddressSanitizer, Store128Test) {
   char *a = Ident((char*)malloc(Ident(12)));
   char *p = a;