summaryrefslogtreecommitdiffstats
path: root/crypto/rc5
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/rc5
parent35dde7480fe6bab5948b3bf6d131d312f668ef5b (diff)
Correct asm exclusions.
Diffstat (limited to 'crypto/rc5')
-rw-r--r--crypto/rc5/rc5_locl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h
index d2dccce96c..f4ebc23004 100644
--- a/crypto/rc5/rc5_locl.h
+++ b/crypto/rc5/rc5_locl.h
@@ -149,7 +149,7 @@
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
#define ROTATE_l32(a,n) _lrotl(a,n)
#define ROTATE_r32(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_l32(a,n) ({ register unsigned int ret; \
asm ("roll %%cl,%0" \