Don't define macros in terms of asm() when __STRICT_ANSI is defined.
This commit is contained in:
parent
a2049ba394
commit
e851895f04
@ -162,7 +162,7 @@
|
|||||||
|
|
||||||
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
|
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
|
||||||
#define ROTATE(a,n) (_lrotr(a,n))
|
#define ROTATE(a,n) (_lrotr(a,n))
|
||||||
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
|
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
|
||||||
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
|
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
|
||||||
# define ROTATE(a,n) ({ register unsigned int ret; \
|
# define ROTATE(a,n) ({ register unsigned int ret; \
|
||||||
asm ("rorl %1,%0" \
|
asm ("rorl %1,%0" \
|
||||||
|
@ -149,7 +149,7 @@
|
|||||||
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
|
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
|
||||||
#define ROTATE_l32(a,n) _lrotl(a,n)
|
#define ROTATE_l32(a,n) _lrotl(a,n)
|
||||||
#define ROTATE_r32(a,n) _lrotr(a,n)
|
#define ROTATE_r32(a,n) _lrotr(a,n)
|
||||||
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
|
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
|
||||||
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
|
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
|
||||||
# define ROTATE_l32(a,n) ({ register unsigned int ret; \
|
# define ROTATE_l32(a,n) ({ register unsigned int ret; \
|
||||||
asm ("roll %%cl,%0" \
|
asm ("roll %%cl,%0" \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user