diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-11-28 13:12:09 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-11-28 13:12:09 +0000 |
| commit | ad00a52f2df2047906dab0e358d539be2dc01bb5 (patch) | |
| tree | 2189be546ec330fc7f9b943f5cb18030463ec55b /crypto/des | |
| parent | e08c7f15b432f31ebb60ef0c7004a5dff4451416 (diff) | |
Intel compiler support update from HEAD.
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/des_locl.h | 4 |
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; \ |