generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring des_locl.h at the same level as in the 0.9.7 branch.

Browse Source 
Don't define macros in terms of asm() when __STRICT_ANSI is defined.
This commit is contained in:
Richard Levitte 2002-12-15 05:54:26 +00:00
parent 6be4688bdc
commit a5a01e9051
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/des/des_locl.h
View File

@ -69,7 +69,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#ifndef OPENSSL_SYS_MSDOS #ifndef OPENSSL_SYS_MSDOS
#if !defined(OPENSSL_SYS_VMS) || defined(__DECC) #if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
@ -90,6 +89,10 @@
#include <io.h> #include <io.h>
#endif #endif
#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)
#include <string.h>
#endif
#ifdef OPENSSL_BUILD_SHLIBCRYPTO #ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN # undef OPENSSL_EXTERN
# define OPENSSL_EXTERN OPENSSL_EXPORT # define OPENSSL_EXTERN OPENSSL_EXPORT
@ -159,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" \