diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2012-03-23 12:21:47 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2012-03-23 12:21:47 +0000 |
| commit | f392910965e300e2c518d32c935baf4457e6394f (patch) | |
| tree | eff15d9847c3867d510d2d3d50cde55bd7a2df45 /compiler-rt | |
| parent | 5e8ffa83c0b0f2dcbe27c31a3926f64ef2ea4e08 (diff) | |
| download | bcm5719-llvm-f392910965e300e2c518d32c935baf4457e6394f.tar.gz bcm5719-llvm-f392910965e300e2c518d32c935baf4457e6394f.zip | |
[ASan] replace '#if ... or ...' with '#if ... || ...'
llvm-svn: 153332
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/tests/asan_test.cc b/compiler-rt/lib/asan/tests/asan_test.cc index cf04c3e7fb7..83a69110539 100644 --- a/compiler-rt/lib/asan/tests/asan_test.cc +++ b/compiler-rt/lib/asan/tests/asan_test.cc @@ -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 @@ TEST(AddressSanitizer, ThreadStackReuseTest) { 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; |
