summaryrefslogtreecommitdiff
path: root/git-compat-util.h
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 /git-compat-util.h
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 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index fc83339bd7..400e921086 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -778,7 +778,7 @@ void git_qsort(void *base, size_t nmemb, size_t size,
#endif
#endif
-#if defined(__GNUC__) || (_MSC_VER >= 1400)
+#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__C99_MACRO_WITH_VA_ARGS)
#define HAVE_VARIADIC_MACROS 1
#endif