diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-11-28 14:05:13 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-11-28 14:05:13 +0100 |
| commit | cf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7 (patch) | |
| tree | 1906fb73108770060c65dd8189e67261b2f84ca2 /crypto/rc5 | |
| parent | New functions to set lookup_crls callback and to retrieve internal X509_STORE (diff) | |
| download | openssl-cf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7.tar.xz openssl-cf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7.zip | |
Update support for Intel compiler: add linux-x86_64-icc and fix problems.
Diffstat (limited to 'crypto/rc5')
| -rw-r--r-- | crypto/rc5/rc5_locl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h index d337f73fad..d3e8001160 100644 --- a/crypto/rc5/rc5_locl.h +++ b/crypto/rc5/rc5_locl.h @@ -146,9 +146,12 @@ *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++)=(unsigned char)(((l) )&0xff)) -#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) +#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) #define ROTATE_l32(a,n) _lrotl(a,n) #define ROTATE_r32(a,n) _lrotr(a,n) +#elif defined(__ICC) +#define ROTATE_l32(a,n) _rotl(a,n) +#define ROTATE_r32(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_l32(a,n) ({ register unsigned int ret; \ |