On Mon, Feb 11, 2013 at 04:06:21PM -0500, Jeff King wrote: > On Mon, Feb 11, 2013 at 12:59:55PM -0800, Matt Kraai wrote: > > > From: Matt Kraai <matt.kraai@xxxxxxxxxxxxxx> > > > > 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. > > So it is not just QNX, but rather older versions of expat? Yes, Expat 1.1 and 1.2 provide xmlparse.h, whereas 1.95.0 and later provide expat.h. > > 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 > > If that is the case, should this #ifdef look for EXPAT_NEEDS_XMLPARSE_H, > and that macro triggered externally? Either in the QNX section of the > Makefile, or potentially by an autoconf macro? I'll submit another patch shortly that does so, defining the variable in the QNX section of config.mak.uname. -- 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