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 855a462d2860e30196dc8cbf95f4b307a2693d5c..1bd1eb983a23ddea979a0c53edb7df60117f0f82 100644 (file)
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -172,7 +172,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 c700dfb1a5ec7c41a33cfebae4b76148e91f2435..658190940c91d7c8a6df05aea832890c310d0ed3 100644 (file)
--- 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