From 85982899368cbb0cf561fd24700de3041ff700e1 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sun, 29 Dec 2002 17:57:09 +0000 Subject: [PATCH] Correct asm exclusions. --- crypto/des/des_locl.h | 2 +- crypto/rc5/rc5_locl.h | 2 +- 2 files changed, 2 insertions(+), 2 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" \ 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" \ -- 2.25.1