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 /vp8/common/generic | |
| parent | 4f69df9969745c3bec295edbb5514a2cc04c7e26 (diff) | |
| download | libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.gz libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.bz2 libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.zip | |
namespace ARCH_* defines
this prevents redefinition warnings if a toolchain sets one
BUG=b/117240165
Change-Id: Ib5d8c303cd05b4dbcc8d42c71ecfcba8f6d7b90c
Diffstat (limited to 'vp8/common/generic')
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 0432ee988..76c34d18a 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -10,11 +10,11 @@ #include "vpx_config.h" #include "vp8_rtcd.h" -#if ARCH_ARM +#if VPX_ARCH_ARM #include "vpx_ports/arm.h" -#elif ARCH_X86 || ARCH_X86_64 +#elif VPX_ARCH_X86 || VPX_ARCH_X86_64 #include "vpx_ports/x86.h" -#elif ARCH_PPC +#elif VPX_ARCH_PPC #include "vpx_ports/ppc.h" #endif #include "vp8/common/onyxc_int.h" @@ -92,11 +92,11 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) { (void)ctx; #endif /* CONFIG_MULTITHREAD */ -#if ARCH_ARM +#if VPX_ARCH_ARM ctx->cpu_caps = arm_cpu_caps(); -#elif ARCH_X86 || ARCH_X86_64 +#elif VPX_ARCH_X86 || VPX_ARCH_X86_64 ctx->cpu_caps = x86_simd_caps(); -#elif ARCH_PPC +#elif VPX_ARCH_PPC ctx->cpu_caps = ppc_simd_caps(); #endif } |