diff options
| author | Mouse <mouse008@gmail.com> | 2016-07-06 12:01:28 -0400 |
|---|---|---|
| committer | Mouse <mouse008@gmail.com> | 2016-07-06 12:01:28 -0400 |
| commit | 87be783cd1b6f13d8501497dbffa0c8c7502997e (patch) | |
| tree | bf7d81e07525cd6403e855383d61a0561bfeba0b /rijndael.h | |
| parent | 7980738496d0a7c5e03f36a8e8f37802d5598ae1 (diff) | |
| download | cryptopp-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 'rijndael.h')
| -rw-r--r-- | rijndael.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,7 +12,7 @@ #include "secblock.h"
// Clang 3.3 integrated assembler crash on Linux
-#if CRYPTOPP_BOOL_X32 || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400))
+#if CRYPTOPP_BOOL_X32 || (defined(CRYPTOPP_CLANG_VERSION) && (CRYPTOPP_CLANG_VERSION < 30400))
# define CRYPTOPP_DISABLE_RIJNDAEL_ASM
#endif
|