Merge branch 'master' into windows-store

pull/174/head
Jeffrey Walton 2016-05-15 05:59:30 -04:00
commit 8313d082ad
2 changed files with 2 additions and 2 deletions

View File

@ -528,7 +528,7 @@ NAMESPACE_END
#define CRYPTOPP_BOOL_ARM32 0 #define CRYPTOPP_BOOL_ARM32 0
#endif #endif
#if defined(__aarch64__) #if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
#define CRYPTOPP_BOOL_ARM64 1 #define CRYPTOPP_BOOL_ARM64 1
#else #else
#define CRYPTOPP_BOOL_ARM64 0 #define CRYPTOPP_BOOL_ARM64 0

View File

@ -528,7 +528,7 @@ NAMESPACE_END
#define CRYPTOPP_BOOL_ARM32 0 #define CRYPTOPP_BOOL_ARM32 0
#endif #endif
#if defined(__aarch64__) #if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
#define CRYPTOPP_BOOL_ARM64 1 #define CRYPTOPP_BOOL_ARM64 1
#else #else
#define CRYPTOPP_BOOL_ARM64 0 #define CRYPTOPP_BOOL_ARM64 0