svn commit: r383818 - in /logging/log4cxx/trunk: build.xml src/domconfigurator.cpp

[carnold]

Author: carnold
Date: Tue Mar  7 00:07:23 2006
New Revision: 383818

URL: http://svn.apache.org/viewcvs?rev=383818&view=rev
Log:
Bug LOGCXX-35: Linux compilation fixes

Modified:
    logging/log4cxx/trunk/build.xml
    logging/log4cxx/trunk/src/domconfigurator.cpp

Modified: logging/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/build.xml?rev=383818&r1=383817&r2=383818&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Mar  7 00:07:23 2006
@@ -6,7 +6,7 @@
         <libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}" 
if="apr.lib.dir"/>
         <libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
         <libset libs="iconv" if="has-iconv"/>
-        <libset libs="xml2 pthread" if="is-unix"/>
+        <libset libs="pthread" if="is-unix"/>
         <libset libs="expat" if="has-expat"/>
         <libset libs="advapi32 odbc32 ws2_32 mswsock" if="is-windows"/>
         <libset libs="stdc++" if="is-gcc"/>
@@ -656,7 +656,6 @@
         <fileset dir="${src.dir}" includes="*.cpp" 
excludes="**/iconv_module.cpp"/>
         <fileset dir="${include.dir}" includes="**/*.h"/>
         <includepath path="${include.dir}"/>
-        <includepath path="/usr/include/libxml2" if="is-unix"/>
         <includepath path="${apr.include.dir}"/>
         <includepath path="${aprutil.include.dir}"/>
         <defineset define="_USRDLL DLL_EXPORTS" if="is-windows"/>
@@ -945,10 +944,8 @@
         &libsets;
 
         <includepath path="${include.dir}"/>
-        <includepath path="/usr/include/libxml2" if="is-unix"/>
         <includepath path="${apr.include.dir}"/>
         <defineset define="LOG4CXX"/>
-        <libset libs="xml2" if="is-unix"/>
         <libset libs="cw32mt" if="is-bcc"/>
 
 

Modified: logging/log4cxx/trunk/src/domconfigurator.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/domconfigurator.cpp?rev=383818&r1=383817&r2=383818&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/domconfigurator.cpp Tue Mar  7 00:07:23 2006
@@ -681,9 +681,9 @@
                 msg.append(filename.getName());
                 msg.append(LOG4CXX_STR("], "));
                 apr_strerror(rv, errbuf, sizeof(errbuf));
-                LOG4CXX_DECODE_CHAR(lerrbuf, errbuf);
+                LOG4CXX_DECODE_CHAR(lerrbuf, std::string(errbuf));
                 apr_xml_parser_geterror(parser, errbufXML, sizeof(errbufXML));
-                LOG4CXX_DECODE_CHAR(lerrbufXML, errbufXML);
+                LOG4CXX_DECODE_CHAR(lerrbufXML, std::string(errbufXML));
                 msg.append(lerrbuf);
                 msg.append(lerrbufXML);
                 LogLog::error(msg);