diff options
| author | James Zern <jzern@google.com> | 2019-09-28 13:12:49 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2019-09-30 11:13:29 -0700 |
| commit | fad865c54ad99ada3e53ea4a290688f0c56aa15d (patch) | |
| tree | 2878dfe8b6fe4a65f4a1e84419fefb147ad7540a /vpx_util | |
| parent | 4f69df9969745c3bec295edbb5514a2cc04c7e26 (diff) | |
| download | libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.gz | |
namespace ARCH_* defines
this prevents redefinition warnings if a toolchain sets one
BUG=b/117240165
Change-Id: Ib5d8c303cd05b4dbcc8d42c71ecfcba8f6d7b90c
Diffstat (limited to 'vpx_util')
| -rw-r--r-- | vpx_util/vpx_atomics.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx_util/vpx_atomics.h b/vpx_util/vpx_atomics.h index b06a8dce3..23ad56685 100644 --- a/vpx_util/vpx_atomics.h +++ b/vpx_util/vpx_atomics.h @@ -51,16 +51,16 @@ extern "C" { do { \ } while (0) #else -#if ARCH_X86 || ARCH_X86_64 +#if VPX_ARCH_X86 || VPX_ARCH_X86_64 // Use a compiler barrier on x86, no runtime penalty. #define vpx_atomic_memory_barrier() __asm__ __volatile__("" ::: "memory") -#elif ARCH_ARM +#elif VPX_ARCH_ARM #define vpx_atomic_memory_barrier() __asm__ __volatile__("dmb ish" ::: "memory") -#elif ARCH_MIPS +#elif VPX_ARCH_MIPS #define vpx_atomic_memory_barrier() __asm__ __volatile__("sync" ::: "memory") #else #error Unsupported architecture! -#endif // ARCH_X86 || ARCH_X86_64 +#endif // VPX_ARCH_X86 || VPX_ARCH_X86_64 #endif // defined(_MSC_VER) #endif // atomic builtin availability check |