va_copy is not available on all systems.
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:43:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
This is just too ugly to be included... die_nicely() uses the variable argument list twice. The recent fix for this in 7e5dcea8311 uses va_copy. However, on older systems this function is not available. This fix assumes that those systems that do have the function actually implement it as macro, and we use it to remove the entire nicely() functionality. Since va_copy() must be provided by the compiler, we don't have a reasonable chance to provide a working definition in git_compat_util.h. --- fast-import.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 2d5224c..edc76a4 100644
--- a/fast-import.c
+++ b/fast-import.c@@ -349,6 +349,7 @@ static unsigned int cmd_save = 100; static uintmax_t next_mark; static struct dbuf new_data; +#ifdef va_copy static void write_branch_report(FILE *rpt, struct branch *b) { fprintf(rpt, "%s:\n", b->name);
@@ -456,6 +457,7 @@ static NORETURN void die_nicely(const char *err, va_list params) va_end(x_params); exit(128); } +#endif static void alloc_objects(unsigned int cnt) {
@@ -2381,7 +2383,9 @@ int main(int argc, const char **argv) prepare_packed_git(); start_packfile(); +#ifdef va_copy set_die_routine(die_nicely); +#endif for (;;) { read_next_command(); if (command_buf.eof)
--
1.5.3.rc5.15.g8ddb