summaryrefslogtreecommitdiffstats
path: root/crypto/des
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2002-12-29 17:57:09 +0000
committerBen Laurie <ben@openssl.org>2002-12-29 17:57:09 +0000
commit85982899368cbb0cf561fd24700de3041ff700e1 (patch)
tree086978610ba59d5960848369401ed98f8995b8e8 /crypto/des
parent35dde7480fe6bab5948b3bf6d131d312f668ef5b (diff)
Correct asm exclusions.
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/des_locl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 6f222474c9..e44e8e98b2 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -162,7 +162,7 @@
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
#define ROTATE(a,n) (_lrotr(a,n))
-#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
+#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
# define ROTATE(a,n) ({ register unsigned int ret; \
asm ("rorl %1,%0" \