diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-01-30 17:49:03 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2016-01-30 17:52:59 +0100 |
| commit | cf888f36354601dd322a8e888e6a1a8c470948be (patch) | |
| tree | 608e8fdc0bc2c663ee290faee3f728b8018d7f06 /external/boost | |
| parent | 585f637c24848e792b49e38ce2bb0f7e63cd97d0 (diff) | |
And now put the patch in the right location
Change-Id: Ie4bf00eeaf152192d8f4fcf6b1d03d474e9d1faa
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/boost_1_60_0.android.undef.warning.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/external/boost/boost_1_60_0.android.undef.warning.patch b/external/boost/boost_1_60_0.android.undef.warning.patch new file mode 100644 index 000000000000..35b46433362c --- /dev/null +++ b/external/boost/boost_1_60_0.android.undef.warning.patch @@ -0,0 +1,16 @@ +diff -ru boost.orig/boost/predef/hardware/simd/x86.h boost/boost/predef/hardware/simd/x86.h +--- a/b/boost.orig/boost/predef/hardware/simd/x86.h 2016-01-30 15:58:27.931804135 +0100 ++++ a/b/boost/boost/predef/hardware/simd/x86.h 2016-01-30 16:02:09.063801650 +0100 +@@ -99,10 +99,10 @@ + #if !defined(BOOST_HW_SIMD_X86) && defined(__SSE3__) + # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE3_VERSION + #endif +-#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2) ++#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)) + # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE2_VERSION + #endif +-#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1) ++#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)) + # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE_VERSION + #endif + #if !defined(BOOST_HW_SIMD_X86) && defined(__MMX__) |