tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx | 2 ++ tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx | 2 ++ tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit d9bc3affb57fa0f2d7676f02fb02d7da40365b37 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Thu Oct 28 12:02:00 2021 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Thu Oct 28 15:48:06 2021 +0200 -Werror,-Wunused-macros (when e.g. building natively on macOS ARM64) Change-Id: Ibff6f913a6251573058c52a8b4106233fad1d443 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124322 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx b/tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx index 39c18e5314e0..7ed8495f36e2 100644 --- a/tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx +++ b/tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx @@ -19,7 +19,9 @@ * handle it, and don't include any headers that contain templates * or inline functions, which includes cppunit. */ +#ifdef LO_AVX2_AVAILABLE #define CPPUNIT_ASSERT_EQUAL(a, b) ((a) == (b) ? (void)0 : abort()) +#endif void CpuRuntimeDetectionX86Checks::checkAVX2() { diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx b/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx index 4b706cd5c1de..7f14e1b51789 100644 --- a/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx +++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx @@ -19,7 +19,9 @@ * handle it, and don't include any headers that contain templates * or inline functions, which includes cppunit. */ +#ifdef LO_SSE2_AVAILABLE #define CPPUNIT_ASSERT_EQUAL(a, b) ((a) == (b) ? (void)0 : abort()) +#endif void CpuRuntimeDetectionX86Checks::checkSSE2() { #ifdef LO_SSE2_AVAILABLE diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx index 5e7c0b3e2a75..9a93dadea79c 100644 --- a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx +++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx @@ -19,7 +19,9 @@ * handle it, and don't include any headers that contain templates * or inline functions, which includes cppunit. */ +#ifdef LO_SSSE3_AVAILABLE #define CPPUNIT_ASSERT_EQUAL(a, b) ((a) == (b) ? (void)0 : abort()) +#endif void CpuRuntimeDetectionX86Checks::checkSSSE3() { #ifdef LO_SSSE3_AVAILABLE