From f6499edf3a56e74372bb83923c9c2c1d5667fb95 Mon Sep 17 00:00:00 2001 From: Marco Deckel Date: Mon, 14 Dec 2015 15:49:49 +0100 Subject: Microsoft ARM support * Adjusted config to compile for Microsoft ARM (e.g. Windows Universal apps) --- vmac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vmac.cpp') diff --git a/vmac.cpp b/vmac.cpp index 45c3d851..936fe8d1 100644 --- a/vmac.cpp +++ b/vmac.cpp @@ -467,7 +467,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)) -- cgit v1.2.1