des_enc.m4: update from master.

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

diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index e44e8e98b25041b6278676de98e0c67ba57d5e22..5b53da96efe3a69d4523cf208924162e7856b6e8 100644 (file)
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -61,7 +61,7 @@
 
 #include <openssl/e_os2.h>
 
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
+#if defined(OPENSSL_SYS_WIN32)
 #ifndef OPENSSL_SYS_MSDOS
 #define OPENSSL_SYS_MSDOS
 #endif
@@ -160,8 +160,10 @@
                                } \
                        }
 
-#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
+#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
 #define        ROTATE(a,n)     (_lrotr(a,n))
+#elif defined(__ICC)
+#define ROTATE(a,n)    (_rotr(a,n))
 #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;   \
@@ -421,8 +423,12 @@
        PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
        }
 
-OPENSSL_EXTERN const DES_LONG DES_SPtrans[8][64];
+extern const DES_LONG DES_SPtrans[8][64];
 
 void fcrypt_body(DES_LONG *out,DES_key_schedule *ks,
                 DES_LONG Eswap0, DES_LONG Eswap1);
+
+#ifdef OPENSSL_SMALL_FOOTPRINT
+#undef DES_UNROLL
+#endif
 #endif