diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-16 21:00:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 21:00:45 -0400 |
| commit | 60eedb97ba67956f6ae5a406bd386cc61f304898 (patch) | |
| tree | 99fbb93edcca8e14a19121feafc9ebada9f507f7 /rijndael_simd.cpp | |
| parent | 9f6400a6072c9e75f5f288cb81728da72f1fa28d (diff) | |
| download | cryptopp-git-60eedb97ba67956f6ae5a406bd386cc61f304898.tar.gz | |
Fix ARM headers and Android compile (PR #896)
* Test fix ARM headers
This problem has been festering for some time. The header file includes are slightly different than the ISA options. Some platforms need an include, others don't.
* Fix cryptest-android.sh and cryptest-ios.sh
* Fix MSVC ARM32 and ARM64 compile
* Split ARM32 and ARM64 recipes in GNUmakefile
Diffstat (limited to 'rijndael_simd.cpp')
| -rw-r--r-- | rijndael_simd.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/rijndael_simd.cpp b/rijndael_simd.cpp index 96d18519..37147e70 100644 --- a/rijndael_simd.cpp +++ b/rijndael_simd.cpp @@ -31,15 +31,12 @@ # include <wmmintrin.h>
#endif
-// C1189: error: This header is specific to ARM targets
-#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+#if (CRYPTOPP_ARM_NEON_HEADER)
# include "adv_simd.h"
-# ifndef _M_ARM64
-# include <arm_neon.h>
-# endif
+# include <arm_neon.h>
#endif
-#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_HEADER)
# include <stdint.h>
# include <arm_acle.h>
#endif
|