You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by NormW <no...@gknw.net> on 2011/03/24 00:16:07 UTC

apr/xml tweaks need a tweak (I think)

Hi,
apr-trunk needs a tweak similar to below to build (for NetWare anyway) 
using Expat 2.0.1 source:

--- apr_xml_expat.c.orig	2011-03-24 07:07:47.187500000 +1100
+++ apr_xml_expat.c	2011-03-24 10:00:01.781250000 +1100
@@ -17,7 +17,6 @@
  #include "apr.h"
  #include "apr_xml.h"

-typedef enum XML_Error XML_Error;
  #if defined(HAVE_XMLPARSE_XMLPARSE_H)
  #include <xmlparse/xmlparse.h>
  #elif defined(HAVE_XMLTOK_XMLPARSE_H)
@@ -28,6 +27,7 @@
  #include <expat.h>
  #endif

+typedef enum XML_Error XML_Error;

  #include "apr_xml_internal.h"

...and if someone is passing by svn apr-trunk xml dir, some Win compat 
eol's would be nice on the new additions please. Will see how far I can 
get with an XML2 build.

Regards,
Norm

Re: apr/xml tweaks need a tweak (I think)

Posted by NormW <no...@gknw.net>.
On 24/03/2011 11:10 AM, Nick Kew wrote:
> On Thu, 24 Mar 2011 10:16:07 +1100
> NormW<no...@gknw.net>  wrote:
>
>> Hi,
>> apr-trunk needs a tweak similar to below to build (for NetWare anyway)
>> using Expat 2.0.1 source:
>>
>> ...and if someone is passing by svn apr-trunk xml dir, some Win compat
>> eol's would be nice on the new additions please. Will see how far I can
>> get with an XML2 build.
>
> Thanks!
>
> FWIW, I'm just hacking the *X build.  Though I don't expect
> to commit for a while (it's just past midnight here).
> If you're on to it now, you could be the first platform
> to have a working build!
>
> (BTW, this should be on dev@apr.  But I won't crosspost
> because for historic reasons the two lists know me by
> different addresses, and have a bad habit of losing
> anything with the wrong From address).
Apologies for posting here but only a 'part-time' NetWare hacker and 
never see APR beyond being a part of Apache, so this is the only list it 
occurs to me to 'bother'.

FWIW can successfully build apr-trunk with libxml2 2.7.8 (nothing as yet 
tested tho), and will likely be able to drop some of the xml2 source 
files once I work out which parts are actually needed.

Regards,
Norm

Re: apr/xml tweaks need a tweak (I think)

Posted by Nick Kew <ni...@webthing.com>.
On Thu, 24 Mar 2011 10:16:07 +1100
NormW <no...@gknw.net> wrote:

> Hi,
> apr-trunk needs a tweak similar to below to build (for NetWare anyway) 
> using Expat 2.0.1 source:
> 
> ...and if someone is passing by svn apr-trunk xml dir, some Win compat 
> eol's would be nice on the new additions please. Will see how far I can 
> get with an XML2 build.

Thanks!

FWIW, I'm just hacking the *X build.  Though I don't expect
to commit for a while (it's just past midnight here).
If you're on to it now, you could be the first platform
to have a working build!

(BTW, this should be on dev@apr.  But I won't crosspost
because for historic reasons the two lists know me by
different addresses, and have a bad habit of losing
anything with the wrong From address).


-- 
Nick Kew

Available for work, contract or permanent.
http://www.webthing.com/~nick/cv.html

Re: apr/xml tweaks need a tweak (I think)

Posted by Guenter Knauf <fu...@apache.org>.
Am 24.03.2011 00:16, schrieb NormW:
> Hi,
> apr-trunk needs a tweak similar to below to build (for NetWare anyway)
> using Expat 2.0.1 source:
>
> --- apr_xml_expat.c.orig 2011-03-24 07:07:47.187500000 +1100
> +++ apr_xml_expat.c 2011-03-24 10:00:01.781250000 +1100
> @@ -17,7 +17,6 @@
> #include "apr.h"
> #include "apr_xml.h"
>
> -typedef enum XML_Error XML_Error;
> #if defined(HAVE_XMLPARSE_XMLPARSE_H)
> #include <xmlparse/xmlparse.h>
> #elif defined(HAVE_XMLTOK_XMLPARSE_H)
> @@ -28,6 +27,7 @@
> #include <expat.h>
> #endif
>
> +typedef enum XML_Error XML_Error;
>
> #include "apr_xml_internal.h"
>
> ...and if someone is passing by svn apr-trunk xml dir, some Win compat
> eol's would be nice on the new additions please. Will see how far I can
> get with an XML2 build.
done:
http://svn.apache.org/viewvc?rev=1084848&view=rev
thanks Norm!

Gün.


Re: apr/xml tweaks need a tweak (I think)

Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 3/23/2011 8:25 PM, Nick Kew wrote:
> 
> On 24 Mar 2011, at 00:10, William A. Rowe Jr. wrote:
> 
>> So if this is not in the .h's (and without namespace protection it has
>> no place in our .h's), can we just 'not do that' and fully declare all
>> our 'enum XML_Error' results, please?  I think that's the better patch.
> 
> No.   "enum XML_Error" is an expat-ism and breaks compile with libxml2.
> Hence typedefing it to int in apr_xml.c (the common code) and to two
> different enums in the lib-specific stuff.
> 
> We can clean it up (and switch to a neutral name) or drop it, but I didn't
> see that as a priority.  But if builds are breaking then I guess it moves up
> the priority list.

Thanks for clarifying!

Re: apr/xml tweaks need a tweak (I think)

Posted by Nick Kew <ni...@webthing.com>.
On 24 Mar 2011, at 00:10, William A. Rowe Jr. wrote:

> So if this is not in the .h's (and without namespace protection it has
> no place in our .h's), can we just 'not do that' and fully declare all
> our 'enum XML_Error' results, please?  I think that's the better patch.

No.   "enum XML_Error" is an expat-ism and breaks compile with libxml2.
Hence typedefing it to int in apr_xml.c (the common code) and to two
different enums in the lib-specific stuff.

We can clean it up (and switch to a neutral name) or drop it, but I didn't
see that as a priority.  But if builds are breaking then I guess it moves up
the priority list.

-- 
Nick Kew

Re: apr/xml tweaks need a tweak (I think)

Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 3/23/2011 6:16 PM, NormW wrote:
> Hi,
> apr-trunk needs a tweak similar to below to build (for NetWare anyway) using Expat 2.0.1
> source:
> 
> --- apr_xml_expat.c.orig    2011-03-24 07:07:47.187500000 +1100
> +++ apr_xml_expat.c    2011-03-24 10:00:01.781250000 +1100
> @@ -17,7 +17,6 @@
>  #include "apr.h"
>  #include "apr_xml.h"
> 
> -typedef enum XML_Error XML_Error;
>  #if defined(HAVE_XMLPARSE_XMLPARSE_H)
>  #include <xmlparse/xmlparse.h>
>  #elif defined(HAVE_XMLTOK_XMLPARSE_H)
> @@ -28,6 +27,7 @@
>  #include <expat.h>
>  #endif
> 
> +typedef enum XML_Error XML_Error;
> 
>  #include "apr_xml_internal.h"
> 
> ...and if someone is passing by svn apr-trunk xml dir, some Win compat eol's would be nice
> on the new additions please. Will see how far I can get with an XML2 build.

So if this is not in the .h's (and without namespace protection it has
no place in our .h's), can we just 'not do that' and fully declare all
our 'enum XML_Error' results, please?  I think that's the better patch.