Charles Bailey <cbailey32@xxxxxxxxxxxxx> writes: > --- Please sign-off your patches ;-) This swaps the precedence of BYTE_ORDER and __BYTE_ORDER from the original, which we may not want to. It is easy for me to swap the order of if/elif to restore it, so it is not a big deal, though. Thanks. > compat/bswap.h | 33 ++++++++++++++++++++++++--------- > 1 file changed, 24 insertions(+), 9 deletions(-) > > diff --git a/compat/bswap.h b/compat/bswap.h > index 120c6c1..f08a9fe 100644 > --- a/compat/bswap.h > +++ b/compat/bswap.h > @@ -101,19 +101,34 @@ static inline uint64_t git_bswap64(uint64_t x) > #undef ntohll > #undef htonll > > -#if !defined(__BYTE_ORDER) > -# if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) > -# define __BYTE_ORDER BYTE_ORDER > -# define __LITTLE_ENDIAN LITTLE_ENDIAN > -# define __BIG_ENDIAN BIG_ENDIAN > +#if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) > + > +# define GIT_BYTE_ORDER BYTE_ORDER > +# define GIT_LITTLE_ENDIAN LITTLE_ENDIAN > +# define GIT_BIG_ENDIAN BIG_ENDIAN > + > +#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN) > + > +# define GIT_BYTE_ORDER __BYTE_ORDER > +# define GIT_LITTLE_ENDIAN __LITTLE_ENDIAN > +# define GIT_BIG_ENDIAN __BIG_ENDIAN > + > +#else > + > +# define GIT_BIG_ENDIAN 4321 > +# define GIT_LITTLE_ENDIAN 1234 > + > +# if defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) > +# define GIT_BYTE_ORDER GIT_BIG_ENDIAN > +# elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) > +# define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN > +# else > +# error "Cannot determine endianness" > # endif > -#endif > > -#if !defined(__BYTE_ORDER) > -# error "Cannot determine endianness" > #endif > > -#if __BYTE_ORDER == __BIG_ENDIAN > +#if GIT_BYTE_ORDER == GIT_BIG_ENDIAN > # define ntohll(n) (n) > # define htonll(n) (n) > #else -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html