From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Dec 2002 00:47:47 +0000 (+0000)
Subject: Ooops! No ROTATE on some platforms after x86_64 performance patch...
X-Git-Tag: OpenSSL_0_9_7a~86^2~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6be4688bdc521e1a4fcf8a6ff4f479ec6f47c6b4;p=openssl

Ooops! No ROTATE on some platforms after x86_64 performance patch...
---

diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 5eb7cff0ca..bc7b508dc1 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -169,7 +169,8 @@
 			   ret;				\
 			})
 # endif
-#else
+#endif
+#ifndef ROTATE
 #define	ROTATE(a,n)	(((a)>>(n))+((a)<<(32-(n))))
 #endif
 
diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h
index c700dfb1a5..658190940c 100644
--- a/crypto/rc5/rc5_locl.h
+++ b/crypto/rc5/rc5_locl.h
@@ -166,8 +166,11 @@
 					ret;			\
 				})
 # endif
-#else
+#endif
+#ifndef ROTATE_l32
 #define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>(32-(n&0x1f))))
+#endif
+#ifndef ROTATE_r32
 #define ROTATE_r32(a,n)     (((a)<<(32-(n&0x1f)))|(((a)&0xffffffff)>>(n&0x1f)))
 #endif