summaryrefslogtreecommitdiffstats
path: root/crypto/des
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2012-11-28 13:05:13 +0000
committerAndy Polyakov <appro@openssl.org>2012-11-28 13:05:13 +0000
commitcf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7 (patch)
tree1906fb73108770060c65dd8189e67261b2f84ca2 /crypto/des
parent2c340864be11a523507f71d8be144f9c593b2be6 (diff)
Update support for Intel compiler: add linux-x86_64-icc and fix problems.
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/des_locl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index a3b512e9b0..5b53da96ef 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -160,8 +160,10 @@
} \
}
-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
+#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; \