Update support for Intel compiler: add linux-x86_64-icc and fix problems.

[openssl.git] / crypto / aes / aes_x86core.c

diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index c1c94d7a3e25d8f9290f8b3bbfcdb575cf593eb1..e438580b2290d4e2a71e557da19f74b8b1dadbeb 100644 (file)
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -43,7 +43,6 @@
 #include <assert.h>
 
 #include <stdlib.h>
-#include <crypto/aes.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
@@ -90,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;   \