PR: 631

[openssl.git] / crypto / ripemd / rmd_locl.h

diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h
index 7068de711bc8919f1a9c1f4bc446d792bcb36d32..7b835dfbd4f81b2acde539989752943af5faf700 100644 (file)
--- a/crypto/ripemd/rmd_locl.h
+++ b/crypto/ripemd/rmd_locl.h
@@ -71,7 +71,7 @@
  *                                     <appro@fy.chalmers.se>
  */
 #ifdef RMD160_ASM
-# if defined(__i386) || defined(_M_IX86) || defined(__INTEL__)
+# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
 #  define ripemd160_block_host_order ripemd160_block_asm_host_order
 # endif
 #endif
@@ -79,7 +79,7 @@
 void ripemd160_block_host_order (RIPEMD160_CTX *c, const void *p,int num);
 void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,int num);
 
-#if defined(__i386) || defined(_M_IX86) || defined(__INTEL__)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
 #define ripemd160_block_data_order ripemd160_block_host_order
 #endif
 
@@ -95,22 +95,18 @@ void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,int num);
 #define HASH_FINAL              RIPEMD160_Final
 #define HASH_BLOCK_HOST_ORDER   ripemd160_block_host_order
 #define        HASH_MAKE_STRING(c,s)   do {    \
-       unsigned long l;                \
-       l=(c)->A; HOST_l2c(l,(s));      \
-       l=(c)->B; HOST_l2c(l,(s));      \
-       l=(c)->C; HOST_l2c(l,(s));      \
-       l=(c)->D; HOST_l2c(l,(s));      \
-       l=(c)->E; HOST_l2c(l,(s));      \
+       unsigned long ll;               \
+       ll=(c)->A; HOST_l2c(ll,(s));    \
+       ll=(c)->B; HOST_l2c(ll,(s));    \
+       ll=(c)->C; HOST_l2c(ll,(s));    \
+       ll=(c)->D; HOST_l2c(ll,(s));    \
+       ll=(c)->E; HOST_l2c(ll,(s));    \
        } while (0)
 #if !defined(L_ENDIAN) || defined(ripemd160_block_data_order)
 #define HASH_BLOCK_DATA_ORDER   ripemd160_block_data_order
 #endif
 
-#ifndef FLAT_INC
-#include "../md32_common.h"
-#else
 #include "md32_common.h"
-#endif
 
 #if 0
 #define F1(x,y,z)       ((x)^(y)^(z))