summaryrefslogtreecommitdiff
path: root/crc.cpp
diff options
context:
space:
mode:
authorMarcel Raad <MarcelRaad@users.noreply.github.com>2017-07-17 18:10:38 +0200
committerJeffrey Walton <noloader@gmail.com>2017-07-17 12:10:38 -0400
commitd9de314e86306ce6dd549ccf6b98a6100c9c7310 (patch)
treefa9689ef80c32a585d3e96c77ad831693f8672e3 /crc.cpp
parent50d1ea83144af55e4938b3972dbc365908750fad (diff)
downloadcryptopp-git-d9de314e86306ce6dd549ccf6b98a6100c9c7310.tar.gz
Fix Windows compilation issues (by RaptorFactor) (#444)
* Fix compilation on Windows with /DUNICODE * Fix linking of fipstest for MSVC targeting ARM (__crt_debugger_hook is not available). * Fix build for Clang on Windows with optimizations on. * Fix a warning about a non-existant warning under Clang. * Fix compilation under Intel C++ 18.0 on Windows
Diffstat (limited to 'crc.cpp')
-rw-r--r--crc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/crc.cpp b/crc.cpp
index e1b51bb9..ccc3fe62 100644
--- a/crc.cpp
+++ b/crc.cpp
@@ -14,7 +14,7 @@ NAMESPACE_BEGIN(CryptoPP)
#endif
#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
-#if (CRYPTOPP_GCC_VERSION >= 40300 || __INTEL_COMPILER >= 1000 || __SUNPRO_CC >= 0x5110 || CRYPTOPP_LLVM_CLANG_VERSION >= 20300 || CRYPTOPP_APPLE_CLANG_VERSION >= 40000) && !defined(__SSE4_2__)
+#if (CRYPTOPP_GCC_VERSION >= 40300 || __INTEL_COMPILER >= 1000 || __SUNPRO_CC >= 0x5110 || CRYPTOPP_LLVM_CLANG_VERSION >= 20300 || CRYPTOPP_APPLE_CLANG_VERSION >= 40000) && !defined(__SSE4_2__) && !defined(_MSC_VER)
GCC_INLINE unsigned int GCC_INLINE_ATTRIB
MM_CRC32_U8(unsigned int crc, unsigned char val)
{