summaryrefslogtreecommitdiffstats
path: root/crypto/aes
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2012-11-28 13:12:09 +0000
committerAndy Polyakov <appro@openssl.org>2012-11-28 13:12:09 +0000
commitad00a52f2df2047906dab0e358d539be2dc01bb5 (patch)
tree2189be546ec330fc7f9b943f5cb18030463ec55b /crypto/aes
parente08c7f15b432f31ebb60ef0c7004a5dff4451416 (diff)
Intel compiler support update from HEAD.
Diffstat (limited to 'crypto/aes')
-rw-r--r--crypto/aes/aes_x86core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index d323e265c0..e438580b22 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -89,8 +89,10 @@ typedef unsigned long long u64;
#endif
#undef ROTATE
-#if defined(_MSC_VER) || defined(__ICC)
+#if defined(_MSC_VER)
# define ROTATE(a,n) _lrotl(a,n)
+#elif defined(__ICC)
+# define ROTATE(a,n) _rotl(a,n)
#elif defined(__GNUC__) && __GNUC__>=2
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
# define ROTATE(a,n) ({ register unsigned int ret; \