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 /test/test_libvpx.cc | |
| 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 'test/test_libvpx.cc')
| -rw-r--r-- | test/test_libvpx.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc index 3405e4566..222a83f8c 100644 --- a/test/test_libvpx.cc +++ b/test/test_libvpx.cc @@ -12,7 +12,7 @@ #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" -#if ARCH_X86 || ARCH_X86_64 +#if VPX_ARCH_X86 || VPX_ARCH_X86_64 #include "vpx_ports/x86.h" #endif extern "C" { @@ -26,7 +26,7 @@ extern void vpx_dsp_rtcd(); extern void vpx_scale_rtcd(); } -#if ARCH_X86 || ARCH_X86_64 +#if VPX_ARCH_X86 || VPX_ARCH_X86_64 static void append_negative_gtest_filter(const char *str) { std::string filter = ::testing::FLAGS_gtest_filter; // Negative patterns begin with one '-' followed by a ':' separated list. @@ -34,12 +34,12 @@ static void append_negative_gtest_filter(const char *str) { filter += str; ::testing::FLAGS_gtest_filter = filter; } -#endif // ARCH_X86 || ARCH_X86_64 +#endif // VPX_ARCH_X86 || VPX_ARCH_X86_64 int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); -#if ARCH_X86 || ARCH_X86_64 +#if VPX_ARCH_X86 || VPX_ARCH_X86_64 const int simd_caps = x86_simd_caps(); if (!(simd_caps & HAS_MMX)) append_negative_gtest_filter(":MMX.*:MMX/*"); if (!(simd_caps & HAS_SSE)) append_negative_gtest_filter(":SSE.*:SSE/*"); @@ -56,7 +56,7 @@ int main(int argc, char **argv) { if (!(simd_caps & HAS_AVX512)) { append_negative_gtest_filter(":AVX512.*:AVX512/*"); } -#endif // ARCH_X86 || ARCH_X86_64 +#endif // VPX_ARCH_X86 || VPX_ARCH_X86_64 #if !CONFIG_SHARED // Shared library builds don't support whitebox tests |