You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/03/30 00:27:32 UTC
svn commit: r1086789 - in /apr/apr/trunk: apr.dsp include/apr.hw libapr.dsp
Author: trawick
Date: Tue Mar 29 22:27:32 2011
New Revision: 1086789
URL: http://svn.apache.org/viewvc?rev=1086789&view=rev
Log:
catch up with XML changes, supporting only expat for now
Modified:
apr/apr/trunk/apr.dsp
apr/apr/trunk/include/apr.hw
apr/apr/trunk/libapr.dsp
Modified: apr/apr/trunk/apr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/apr.dsp?rev=1086789&r1=1086788&r2=1086789&view=diff
==============================================================================
--- apr/apr/trunk/apr.dsp (original)
+++ apr/apr/trunk/apr.dsp Tue Mar 29 22:27:32 2011
@@ -766,6 +766,10 @@ SOURCE=.\xlate\xlate.c
SOURCE=.\xml\apr_xml.c
# End Source File
+# Begin Source File
+
+SOURCE=.\xml\apr_xml_expat.c
+# End Source File
# End Group
# End Group
# Begin Group "Private Header Files"
Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=1086789&r1=1086788&r2=1086789&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Tue Mar 29 22:27:32 2011
@@ -660,6 +660,9 @@ typedef int apr_wait_t;
#define APU_HAVE_ICONV 0
#define APR_HAS_XLATE (APU_HAVE_ICONV)
+#define APU_USE_EXPAT 1
+#define APU_USE_LIBXML2 0
+
/** @} */
/* Definitions that only Win32 programs need to compile properly. */
Modified: apr/apr/trunk/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.dsp?rev=1086789&r1=1086788&r2=1086789&view=diff
==============================================================================
--- apr/apr/trunk/libapr.dsp (original)
+++ apr/apr/trunk/libapr.dsp Tue Mar 29 22:27:32 2011
@@ -801,6 +801,10 @@ SOURCE=.\xlate\xlate.c
SOURCE=.\xml\apr_xml.c
# End Source File
+# Begin Source File
+
+SOURCE=.\xml\apr_xml_expat.c
+# End Source File
# End Group
# End Group
# Begin Group "Private Header Files"
Re: svn commit: r1086789 - in /apr/apr/trunk: apr.dsp include/apr.hw libapr.dsp
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, Mar 29, 2011 at 7:05 PM, Nick Kew <ni...@apache.org> wrote:
> On Tue, 29 Mar 2011 18:36:03 -0400
> Jeff Trawick <tr...@gmail.com> wrote:
>
>> On Tue, Mar 29, 2011 at 6:27 PM, <tr...@apache.org> wrote:
>> > Author: trawick
>> > Date: Tue Mar 29 22:27:32 2011
>> > New Revision: 1086789
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1086789&view=rev
>> > Log:
>> > catch up with XML changes, supporting only expat for now
>>
>> though the link of testall fails to resolve XML_foo functions; I don't
>> know why, as I had the test suite linking with expat and everything
>> else a week or so ago, and I don't see how niq's changes would affect
>> that
>
> Neither do I. The symbols should be the same, unless I've
> inadvertently clobbered something that resolves to one of
> those MSVC++ symbols like __DLLIMPORT.
>
> (I presume updates to configure.in and any .m4 don't affect Windows?
basically; MinGW build uses .in/.m4; that doesn't affect Microsoft
build, though stuff in apr.h.in may need to get reflected in apr.hw
for the Microsoft build
> And that apr_xml_expat is being linked?)
yes, that part is resolved
Re: svn commit: r1086789 - in /apr/apr/trunk: apr.dsp
include/apr.hw libapr.dsp
Posted by Nick Kew <ni...@apache.org>.
On Tue, 29 Mar 2011 18:36:03 -0400
Jeff Trawick <tr...@gmail.com> wrote:
> On Tue, Mar 29, 2011 at 6:27 PM, <tr...@apache.org> wrote:
> > Author: trawick
> > Date: Tue Mar 29 22:27:32 2011
> > New Revision: 1086789
> >
> > URL: http://svn.apache.org/viewvc?rev=1086789&view=rev
> > Log:
> > catch up with XML changes, supporting only expat for now
>
> though the link of testall fails to resolve XML_foo functions; I don't
> know why, as I had the test suite linking with expat and everything
> else a week or so ago, and I don't see how niq's changes would affect
> that
Neither do I. The symbols should be the same, unless I've
inadvertently clobbered something that resolves to one of
those MSVC++ symbols like __DLLIMPORT.
(I presume updates to configure.in and any .m4 don't affect Windows?
And that apr_xml_expat is being linked?)
--
Nick Kew
Available for work, contract or permanent.
http://www.webthing.com/~nick/cv.html
Re: svn commit: r1086789 - in /apr/apr/trunk: apr.dsp include/apr.hw libapr.dsp
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, Mar 29, 2011 at 6:27 PM, <tr...@apache.org> wrote:
> Author: trawick
> Date: Tue Mar 29 22:27:32 2011
> New Revision: 1086789
>
> URL: http://svn.apache.org/viewvc?rev=1086789&view=rev
> Log:
> catch up with XML changes, supporting only expat for now
though the link of testall fails to resolve XML_foo functions; I don't
know why, as I had the test suite linking with expat and everything
else a week or so ago, and I don't see how niq's changes would affect
that
I haven't stared at test/Makefile.win enough