diff options
author | Richard Levitte <levitte@openssl.org> | 2000-04-01 10:39:33 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-04-01 10:39:33 +0000 |
commit | c2359eb18cc04e606d12c47b19a007ab685f7fc4 (patch) | |
tree | 82f1b8b90df2cc7871c74ab64e0d15d04b0bd7ea | |
parent | cf194c1f68eab4ea0085c6fdee89090be4487ca2 (diff) | |
download | openssl-new-c2359eb18cc04e606d12c47b19a007ab685f7fc4.tar.gz |
_lrotl and _lrotr are defined in MSVC but nowhere else that we know
off.
-rw-r--r-- | crypto/cast/cast_lcl.h | 2 | ||||
-rw-r--r-- | crypto/des/des_locl.h | 2 | ||||
-rw-r--r-- | crypto/rc5/rc5_locl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h index cfe3842e91..5fab8a43f6 100644 --- a/crypto/cast/cast_lcl.h +++ b/crypto/cast/cast_lcl.h @@ -151,7 +151,7 @@ *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++)=(unsigned char)(((l) )&0xff)) -#if defined(WIN32) +#if defined(WIN32) && defined(_MSC_VER) #define ROTL(a,n) (_lrotl(a,n)) #else #define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n)))) diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h index 4dfed199a7..1ace8f5930 100644 --- a/crypto/des/des_locl.h +++ b/crypto/des/des_locl.h @@ -155,7 +155,7 @@ } \ } -#if defined(WIN32) +#if defined(WIN32) && defined(_MSC_VER) #define ROTATE(a,n) (_lrotr(a,n)) #else #define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n)))) diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h index 718c6162ea..ec33829c97 100644 --- a/crypto/rc5/rc5_locl.h +++ b/crypto/rc5/rc5_locl.h @@ -146,7 +146,7 @@ *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++)=(unsigned char)(((l) )&0xff)) -#if defined(WIN32) +#if defined(WIN32) && defined(_MSC_VER) #define ROTATE_l32(a,n) _lrotl(a,n) #define ROTATE_r32(a,n) _lrotr(a,n) #else |