git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt Kraai <kraai@ftbfs.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Matt Kraai <matt.kraai@amo.abbott.com>
Subject: [PATCH] Include xmlparse.h instead of expat.h on QNX
Date: Mon, 11 Feb 2013 12:59:55 -0800	[thread overview]
Message-ID: <1360616395-18912-1-git-send-email-kraai@ftbfs.org> (raw)

From: Matt Kraai <matt.kraai@amo.abbott.com>

QNX 6.3.2 through 6.5.0 include Expat 1.1, which provides xmlparse.h
instead of expat.h, so include the former on QNX systems.

Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com>
---
 http-push.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/http-push.c b/http-push.c
index 9923441..55c575e 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,11 @@
 #include "list-objects.h"
 #include "sigchain.h"
 
+#ifndef __QNX__
 #include <expat.h>
+#else
+#include <xmlparse.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

             reply	other threads:[~2013-02-11 21:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-11 20:59 Matt Kraai [this message]
2013-02-11 21:06 ` [PATCH] Include xmlparse.h instead of expat.h on QNX Jeff King
2013-02-11 21:24   ` Matt Kraai
2013-02-11 22:03     ` [PATCH] Allow building with xmlparse.h Matt Kraai
2013-02-11 22:11       ` Junio C Hamano
2013-02-11 22:30         ` Matt Kraai
2013-02-11 22:35           ` Junio C Hamano
2013-02-11 21:41   ` [PATCH] Include xmlparse.h instead of expat.h on QNX Junio C Hamano
2013-02-11 21:34 ` Junio C Hamano
2013-02-11 21:49   ` Matt Kraai
2013-02-11 21:53     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360616395-18912-1-git-send-email-kraai@ftbfs.org \
    --to=kraai@ftbfs.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=matt.kraai@amo.abbott.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).