Commit a5a01e90 authored by Richard Levitte's avatar Richard Levitte
Browse files

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

Don't define macros in terms of asm() when __STRICT_ANSI is defined.
parent 6be4688b

crypto/des/des_locl.h

+5 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 


#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#ifndef OPENSSL_SYS_MSDOS

#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
@@ -90,6 +89,10 @@ 
#include <io.h>

#endif



#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)

#include <string.h>

#endif



#ifdef OPENSSL_BUILD_SHLIBCRYPTO

# undef OPENSSL_EXTERN

# define OPENSSL_EXTERN OPENSSL_EXPORT
@@ -159,7 +162,7 @@ 


#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)

#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__)

#  define ROTATE(a,n)	({ register unsigned int ret;	\

				asm ("rorl %1,%0"	\