diff options
author | Jeffrey Walton <noloader@gmail.com> | 2015-12-14 15:52:13 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2015-12-14 15:52:13 -0500 |
commit | be67acdb1d846891b74d1802e38e7cc199c8e413 (patch) | |
tree | 7e9f77c2d4487f56413c65693d6b29b1c525aa70 /vmac.cpp | |
parent | d9749ce7acb84db24d36f20d3af7e1de3061fa35 (diff) | |
parent | f6499edf3a56e74372bb83923c9c2c1d5667fb95 (diff) | |
download | cryptopp-git-be67acdb1d846891b74d1802e38e7cc199c8e413.tar.gz |
Merge pull request #84 from m-deckel/visualstudio-arm
Microsoft ARM support
Diffstat (limited to 'vmac.cpp')
-rw-r--r-- | vmac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -472,7 +472,7 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64, #define AccumulateNH(a, b, c) a += word128(b)*(c)
#define Multiply128(r, i1, i2) r = word128(word64(i1)) * word64(i2)
#else
- #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
+ #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && !defined(_M_ARM)
#define MUL32(a, b) __emulu(word32(a), word32(b))
#else
#define MUL32(a, b) ((word64)((word32)(a)) * (word32)(b))
|