summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 10:08:06 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-29 10:08:07 -0700
commitce71c1f3398a956b0152f8ebf11b7a9d50a3095e (patch)
tree67e956e549c2f7726b75b15ba96e9fe47a1bb633 /compat
parentc1777a297043a06d6c18d383d17447f5eefcdcbe (diff)
parentbfb0e6fcd2826a869383b766712131a07a8059b0 (diff)
downloadgit-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.tar.gz
Merge branch 'dm/port2zos'
z/OS port * dm/port2zos: compat/bswap.h: detect endianness from XL C compiler macros Makefile: reorder linker flags in the git executable rule git-compat-util.h: support variadic macros with the XL C compiler
Diffstat (limited to 'compat')
-rw-r--r--compat/bswap.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/bswap.h b/compat/bswap.h
index f6fd9a6a6c..7fed637ed0 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -122,6 +122,10 @@ static inline uint64_t git_bswap64(uint64_t x)
# define GIT_BYTE_ORDER GIT_BIG_ENDIAN
# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
# define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN
+# elif defined(__THW_BIG_ENDIAN__) && !defined(__THW_LITTLE_ENDIAN__)
+# define GIT_BYTE_ORDER GIT_BIG_ENDIAN
+# elif defined(__THW_LITTLE_ENDIAN__) && !defined(__THW_BIG_ENDIAN__)
+# define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN
# else
# error "Cannot determine endianness"
# endif