Redundant now as it's moved to ./Makefile.org.

[openssl.git] / crypto / des / des_locl.h

diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 5eb7cff0cadabfbe7b87555fc9437dc939d125a6..e44e8e98b25041b6278676de98e0c67ba57d5e22 100644 (file)
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -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(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"       \
@@ -169,7 +172,8 @@
                           ret;                         \
                        })
 # endif
-#else
+#endif
+#ifndef ROTATE
 #define        ROTATE(a,n)     (((a)>>(n))+((a)<<(32-(n))))
 #endif