diff --git a/blake2.cpp b/blake2.cpp
index f2205ea5..13923792 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -25,7 +25,7 @@ NAMESPACE_BEGIN(CryptoPP)
 
 // Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x.
 // Also see http://stackoverflow.com/a/38547909/608639
-#if ((defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5130)) || (defined(_MSC_VER) && (_MSC_VER >= 1200) && (_MSC_VER <= 1400))) && CRYPTOPP_BOOL_SSE2_AVAILABLE
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (_MSC_VER >= 1200 && _MSC_VER < 1600))
 inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
 {
     union INT_128_64x2 {