From: Junio C Hamano <gitster@pobox.com>
To: Matt Kraai <kraai@ftbfs.org>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Matt Kraai <matt.kraai@amo.abbott.com>
Subject: Re: [PATCH] Allow building with xmlparse.h
Date: Mon, 11 Feb 2013 14:11:16 -0800 [thread overview]
Message-ID: <7vy5eujybf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1360620225-19587-1-git-send-email-kraai@ftbfs.org> (Matt Kraai's message of "Mon, 11 Feb 2013 14:03:45 -0800")
Matt Kraai <kraai@ftbfs.org> writes:
> From: Matt Kraai <matt.kraai@amo.abbott.com>
>
> 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>
> ---
> ...
> diff --git a/http-push.c b/http-push.c
> index 9923441..7202e2d 100644
> --- a/http-push.c
> +++ b/http-push.c
> @@ -11,7 +11,11 @@
> #include "list-objects.h"
> #include "sigchain.h"
>
> +#ifndef EXPAT_NEEDS_XMLPARSE_H
> #include <expat.h>
> +#else
> +#include <xmlparse.h>
> +#endif
Thanks for a quick re-roll.
Is it just me who finds the above hard to read and find the below
much more natural?
#ifdef NEEDS_FOO_H
#include <foo.h>
#else
#include <bar.h>
#endif
next prev parent reply other threads:[~2013-02-11 22:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 20:59 [PATCH] Include xmlparse.h instead of expat.h on QNX Matt Kraai
2013-02-11 21:06 ` 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 [this message]
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=7vy5eujybf.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kraai@ftbfs.org \
--cc=matt.kraai@amo.abbott.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.