diff options
| author | djm <> | 2008-09-06 12:15:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:15:54 +0000 |
| commit | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch) | |
| tree | 44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto/rc5/rc5_locl.h | |
| parent | 4f828b924f54507141fb95ebe49dfcd261945e85 (diff) | |
| download | openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.gz openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.bz2 openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.zip | |
import of OpenSSL 0.9.8h
Diffstat (limited to 'src/lib/libcrypto/rc5/rc5_locl.h')
| -rw-r--r-- | src/lib/libcrypto/rc5/rc5_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/rc5/rc5_locl.h b/src/lib/libcrypto/rc5/rc5_locl.h index f4ebc23004..282dd38822 100644 --- a/src/lib/libcrypto/rc5/rc5_locl.h +++ b/src/lib/libcrypto/rc5/rc5_locl.h | |||
| @@ -146,7 +146,7 @@ | |||
| 146 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | 146 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ |
| 147 | *((c)++)=(unsigned char)(((l) )&0xff)) | 147 | *((c)++)=(unsigned char)(((l) )&0xff)) |
| 148 | 148 | ||
| 149 | #if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER) | 149 | #if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) |
| 150 | #define ROTATE_l32(a,n) _lrotl(a,n) | 150 | #define ROTATE_l32(a,n) _lrotl(a,n) |
| 151 | #define ROTATE_r32(a,n) _lrotr(a,n) | 151 | #define ROTATE_r32(a,n) _lrotr(a,n) |
| 152 | #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) | 152 | #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) |