summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorMatt Kraai <matt.kraai@amo.abbott.com>2013-02-11 14:03:45 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-11 14:33:04 -0800
commit081fd8d093887b0cc5055d8a191ae2c26274846b (patch)
treea5376dee8a17b6a4a286ff21277c577967ab3ff4 /http-push.c
parentaa3982890fe7506badfddf6252402a335a4d72b7 (diff)
downloadgit-081fd8d093887b0cc5055d8a191ae2c26274846b.tar.gz
Allow building with xmlparse.h
expat 1.1 and 1.2 provide xmlparse.h instead of expat.h. Include the former on systems that define the EXPAT_NEEDS_XMLPARSE_H variable and define that variable on QNX systems, which ship with expat 1.1. Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/http-push.c b/http-push.c
index 3e72e84e84..bd66f6ab6e 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,11 @@
#include "list-objects.h"
#include "sigchain.h"
+#ifdef EXPAT_NEEDS_XMLPARSE_H
+#include <xmlparse.h>
+#else
#include <expat.h>
+#endif
static const char http_push_usage[] =
"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";