summaryrefslogtreecommitdiff
path: root/sha.h
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 /sha.h
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 'sha.h')
-rw-r--r--sha.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha.h b/sha.h
index c70d9d1f..544e8056 100644
--- a/sha.h
+++ b/sha.h
@@ -11,7 +11,7 @@
#include "iterhash.h"
// Clang 3.3 integrated assembler crash on Linux
-#if defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)
+#if defined(CRYPTOPP_CLANG_VERSION) && (CRYPTOPP_CLANG_VERSION < 30400)
# define CRYPTOPP_DISABLE_SHA_ASM
#endif