diff options
author | djm <> | 2008-09-06 12:15:54 +0000 |
---|---|---|
committer | djm <> | 2008-09-06 12:15:54 +0000 |
commit | f519f07de9bfb123f2b32aa3965e6f73c8364b80 (patch) | |
tree | ad353b318ee632f73212a174cffac9bb9e573b7c /src/lib/libcrypto/rc5/rc5_locl.h | |
parent | 89b182c5db7ea802edfc3ee734b4899b43e13e09 (diff) | |
parent | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (diff) | |
download | openbsd-f519f07de9bfb123f2b32aa3965e6f73c8364b80.tar.gz openbsd-f519f07de9bfb123f2b32aa3965e6f73c8364b80.tar.bz2 openbsd-f519f07de9bfb123f2b32aa3965e6f73c8364b80.zip |
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
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) |