Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / md5lib / md5lib.c

diff --git a/libs/md5lib/md5lib.c b/libs/md5lib/md5lib.c
index f30d0958b48aef14a59628a87ba5603eaedca4db..897e524f75ca27a291a28ab1f1700ef1983e9edd 100644 (file)
--- a/libs/md5lib/md5lib.c
+++ b/libs/md5lib/md5lib.c
@@ -54,14 +54,10 @@
  */
 
 #include "md5lib.h" /* ydnar */
+#include "globaldefs.h"
 #include <string.h>
 
-/* ydnar: gtkradiant endian picking */
-#ifdef _SGI_SOURCE
-#define __BIG_ENDIAN__
-#endif
-
-#ifdef __BIG_ENDIAN__
+#if GDEF_ARCH_ENDIAN_BIG
 #define ARCH_IS_BIG_ENDIAN  1
 #else
 #define ARCH_IS_BIG_ENDIAN  0
@@ -69,11 +65,7 @@
 /* ydnar: end */
 
 #undef BYTE_ORDER   /* 1 = big-endian, -1 = little-endian, 0 = unknown */
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define BYTE_ORDER ( ARCH_IS_BIG_ENDIAN ? 1 : -1 )
-#else
-#  define BYTE_ORDER 0
-#endif
+#define BYTE_ORDER ( ARCH_IS_BIG_ENDIAN ? 1 : -1 )
 
 #define T_MASK ( ( md5_word_t ) ~0 )
 #define T1 /* 0xd76aa478 */ ( T_MASK ^ 0x28955b87 )
@@ -197,11 +189,11 @@ md5_process( md5_state_t *pms, const md5_byte_t *data /*[64]*/ ){
                        const md5_byte_t *xp = data;
                        int i;
 
-#  if BYTE_ORDER == 0
+#if BYTE_ORDER == 0
                        X = xbuf;   /* (dynamic only) */
-#  else
-#    define xbuf X      /* (static only) */
-#  endif
+#else
+#define xbuf X      /* (static only) */
+#endif
                        for ( i = 0; i < 16; ++i, xp += 4 )
                                xbuf[i] = xp[0] + ( xp[1] << 8 ) + ( xp[2] << 16 ) + ( xp[3] << 24 );
                }