From c2359eb18cc04e606d12c47b19a007ab685f7fc4 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 1 Apr 2000 10:39:33 +0000 Subject: [PATCH 1/1] _lrotl and _lrotr are defined in MSVC but nowhere else that we know off. --- crypto/cast/cast_lcl.h | 2 +- crypto/des/des_locl.h | 2 +- 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 -- 2.34.1