From: Matt Kraai <matt.kraai@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> --- Makefile | 6 ++++++ config.mak.uname | 1 + http-push.c | 4 ++++ 3 files changed, 11 insertions(+) I've changed #ifndef to #ifdef and changed the order of the branches in http-push.c. If you'd also like me to rename the variable (e.g., to NEEDS_XMLPARSE_H), please let me know. diff --git a/Makefile b/Makefile index 5a2e02d..720fc18 100644 --- a/Makefile +++ b/Makefile @@ -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. @@ -1089,6 +1092,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 bea34f0..8743a6d 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 9923441..9fa47a7 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"; -- 1.8.1.2.547.g7ce9def -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html