Merge branch 'ltrim-tests' of git://github.com/pietern/redis

[redis.git] / sha1.c

diff --git a/sha1.c b/sha1.c
index a768a7a7f85e77afa476bd7de57f63617b0c8546..2c50433e80a87bc606091292a03620895cc173b2 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -24,13 +24,16 @@ A million repetitions of "a"
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h> /* for u_int*_t */
+#if defined(__sun)
+#include "solarisfixes.h"
+#endif
 #include "sha1.h"
 
 #ifndef BYTE_ORDER
 #if (BSD >= 199103)
 # include <machine/endian.h>
 #else
-#ifdef linux
+#if defined(linux) || defined(__linux__)
 # include <endian.h>
 #else
 #define        LITTLE_ENDIAN   1234    /* least-significant byte first (vax, pc) */
@@ -49,13 +52,21 @@ A million repetitions of "a"
     defined(apollo) || defined(__convex__) || defined(_CRAY) || \
     defined(__hppa) || defined(__hp9000) || \
     defined(__hp9000s300) || defined(__hp9000s700) || \
-    defined (BIT_ZERO_ON_LEFT) || defined(m68k)
+    defined (BIT_ZERO_ON_LEFT) || defined(m68k) || defined(__sparc)
 #define BYTE_ORDER     BIG_ENDIAN
 #endif
 #endif /* linux */
 #endif /* BSD */
 #endif /* BYTE_ORDER */
 
+#if defined(__BYTE_ORDER) && !defined(BYTE_ORDER)
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#define BYTE_ORDER LITTLE_ENDIAN
+#else
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+#endif
+
 #if !defined(BYTE_ORDER) || \
     (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
     BYTE_ORDER != PDP_ENDIAN)
@@ -64,7 +75,7 @@ A million repetitions of "a"
         * which will force your compiles to bomb until you fix
         * the above macros.
         */
-  error "Undefined or invalid BYTE_ORDER";
+#error "Undefined or invalid BYTE_ORDER"
 #endif
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))