summaryrefslogtreecommitdiff
path: root/blake2.cpp
diff options
context:
space:
mode:
authorMouse <mouse008@gmail.com>2016-07-06 12:01:28 -0400
committerMouse <mouse008@gmail.com>2016-07-06 12:01:28 -0400
commit87be783cd1b6f13d8501497dbffa0c8c7502997e (patch)
treebf7d81e07525cd6403e855383d61a0561bfeba0b /blake2.cpp
parent7980738496d0a7c5e03f36a8e8f37802d5598ae1 (diff)
downloadcryptopp-git-87be783cd1b6f13d8501497dbffa0c8c7502997e.tar.gz
Revert "Merge remote-tracking branch 'upstream/master'" - not intended to be merged by me
This reverts commit 762c315566bce681e380641d1894251f984eac10, reversing changes made to b48866631a5587e9348245fedd6f1e0871df35db.
Diffstat (limited to 'blake2.cpp')
-rw-r--r--blake2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/blake2.cpp b/blake2.cpp
index 0cb858b1..77eef8ce 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -35,7 +35,7 @@ NAMESPACE_BEGIN(CryptoPP)
// Apple Clang 6.0/Clang 3.5 does not have SSSE3 intrinsics
// http://llvm.org/bugs/show_bug.cgi?id=20213
-#if (defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION <= 60000)) || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION <= 30500))
+#if (defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION <= 60000)) || (defined(CRYPTOPP_CLANG_VERSION) && (CRYPTOPP_CLANG_VERSION <= 30500))
# undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
#endif