summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:08 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:08 -0800
commitbfc1f6a1c18b3b0eba7e9126fb0b2688f865a110 (patch)
tree3cc558797c0996131e26d0a3bb3d6f0f96e5638b /http-push.c
parentc0acef9b8ae84e7f67a1c231eb97ecfd897c5651 (diff)
parent081fd8d093887b0cc5055d8a191ae2c26274846b (diff)
downloadgit-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.gz
Merge branch 'mk/old-expat'
* mk/old-expat: Allow building with xmlparse.h
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";