compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
The previous commit swaps the order we check the macros defined by the compiler and the system headers from the original. Since the order of check should not matter (i.e. it is insane to define both __BIG_ENDIAN and friends and BIG_ENDIAN and friends and in a conflicting way), it is the most conservative thing to do not to change it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 2, 2014 at 12:36 UTC
839fa9c500c7771d15831e2bcf77697cd70620f9
1 file changed
+7
-7
compat/bswap.h
+7
-7
@@ -101,18 +101,18 @@ static inline uint64_t git_bswap64(uint64_t x)
101
#undef ntohll
102
#undef htonll
103
104
-#if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
105
-
106
-# define GIT_BYTE_ORDER BYTE_ORDER
107
-# define GIT_LITTLE_ENDIAN LITTLE_ENDIAN
108
-# define GIT_BIG_ENDIAN BIG_ENDIAN
109
-
110
-#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
104
+#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
105
106
# define GIT_BYTE_ORDER __BYTE_ORDER
107
# define GIT_LITTLE_ENDIAN __LITTLE_ENDIAN
108
# define GIT_BIG_ENDIAN __BIG_ENDIAN
109
110
+#elif defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
111
+
112
+# define GIT_BYTE_ORDER BYTE_ORDER
113
+# define GIT_LITTLE_ENDIAN LITTLE_ENDIAN
114
+# define GIT_BIG_ENDIAN BIG_ENDIAN
115
+
116
#else
117
118
# define GIT_BIG_ENDIAN 4321