diff options
author | Jeffrey Walton <noloader@gmail.com> | 2016-09-16 11:28:23 -0400 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2016-09-16 11:28:23 -0400 |
commit | 6847978f0a835d0a8a5f39372c3408b4239f9639 (patch) | |
tree | 451a13422db3516a87e19ed14a781d32386de1c3 | |
parent | 399a1546de71f41598c15edada28e7f0d616f541 (diff) | |
parent | 69f3d9483e8370f35fe5d81cd4936bba5a5a7a61 (diff) | |
download | cryptopp-git-6847978f0a835d0a8a5f39372c3408b4239f9639.tar.gz |
Merge 'master' into 'trap'
-rw-r--r-- | gcm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,7 +35,7 @@ NAMESPACE_BEGIN(CryptoPP) #elif (defined(CRYPTOPP_LLVM_CLANG_VERSION) || defined(CRYPTOPP_APPLE_CLANG_VERSION)) && defined(CRYPTOPP_X64_ASM_AVAILABLE)
// 'movd eax, xmm0' or 'movd rax, xmm0'. REG_WORD() macro supplies REG32 or REG64.
# define USE_MOVD_REG32_OR_REG64 1
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) || defined(_MSC_VER)
// 'movd eax, xmm0' or 'movd rax, xmm0'. REG_WORD() macro supplies REG32 or REG64.
# define USE_MOVD_REG32_OR_REG64 1
#else
|