diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 16:06:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 16:06:08 -0800 |
| commit | bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110 (patch) | |
| tree | 3cc558797c0996131e26d0a3bb3d6f0f96e5638b | |
| parent | c0acef9b8ae84e7f67a1c231eb97ecfd897c5651 (diff) | |
| parent | 081fd8d093887b0cc5055d8a191ae2c26274846b (diff) | |
| download | git-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.gz git-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.xz | |
Merge branch 'mk/old-expat'
* mk/old-expat:
Allow building with xmlparse.h
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | config.mak.uname | 1 | ||||
| -rw-r--r-- | http-push.c | 4 |
3 files changed, 11 insertions, 0 deletions
@@ -43,6 +43,9 @@ all:: # Define EXPATDIR=/foo/bar if your expat header and library files are in # /foo/bar/include and /foo/bar/lib directories. # +# Define EXPAT_NEEDS_XMLPARSE_H if you have an old version of expat (e.g., +# 1.1 or 1.2) that provides xmlparse.h instead of expat.h. +# # Define NO_GETTEXT if you don't want Git output to be translated. # A translated Git requires GNU libintl or another gettext implementation, # plus libintl-perl at runtime. @@ -1118,6 +1121,9 @@ else else EXPAT_LIBEXPAT = -lexpat endif + ifdef EXPAT_NEEDS_XMLPARSE_H + BASIC_CFLAGS += -DEXPAT_NEEDS_XMLPARSE_H + endif endif endif diff --git a/config.mak.uname b/config.mak.uname index bea34f051..8743a6d0a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -523,6 +523,7 @@ endif endif ifeq ($(uname_S),QNX) COMPAT_CFLAGS += -DSA_RESTART=0 + EXPAT_NEEDS_XMLPARSE_H = YesPlease HAVE_STRINGS_H = YesPlease NEEDS_SOCKET = YesPlease NO_FNMATCH_CASEFOLD = YesPlease diff --git a/http-push.c b/http-push.c index 3e72e84e8..bd66f6ab6 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"; |