Author: carnold
Date: Tue Nov 1 13:31:31 2005
New Revision: 330129
URL: http://svn.apache.org/viewcvs?rev=330129&view=rev
Log:
LOGCXX-114: Upgrade APR to 1.2.2, patch apr-util
Removed:
logging/log4cxx/trunk/apriconv-build.xml
Modified:
logging/log4cxx/trunk/apr-util-1.2.2.patch
logging/log4cxx/trunk/build.xml
Modified: logging/log4cxx/trunk/apr-util-1.2.2.patch
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/apr-util-1.2.2.patch?rev=330129&r1=330128&r2=330129&view=diff
==============================================================================
--- logging/log4cxx/trunk/apr-util-1.2.2.patch (original)
+++ logging/log4cxx/trunk/apr-util-1.2.2.patch Tue Nov 1 13:31:31 2005
@@ -7,7 +7,7 @@
int ret = driver->start_transaction(pool, handle, trans);
if (*trans) {
- apr_pool_cleanup_register(pool, *trans,
(void*)driver->end_transaction,
-+ apr_pool_cleanup_register(pool, *trans, (int (*)(void*))
driver->end_transaction,
++ apr_pool_cleanup_register(pool, *trans, (apr_status_t (*)(void*))
driver->end_transaction,
apr_pool_cleanup_null);
}
return ret;
@@ -16,7 +16,7 @@
apr_dbd_transaction_t *trans)
{
- apr_pool_cleanup_kill(pool, trans, (void*)driver->end_transaction);
-+ apr_pool_cleanup_kill(pool, trans, (int (*)(void*))
driver->end_transaction);
++ apr_pool_cleanup_kill(pool, trans, (apr_status_t (*)(void*))
driver->end_transaction);
return driver->end_transaction(trans);
}
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/build.xml?rev=330129&r1=330128&r2=330129&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Nov 1 13:31:31 2005
@@ -478,6 +478,9 @@
<param name="module" value="apr-util"/>
<param name="module.version" value="${aprutil.version}"/>
</antcall>
+ <patch patchfile="${base.dir}/apr-util-${aprutil.version}.patch"
+ dir="${lib.dir}/apr-util-${aprutil.version}"
+ strip="0"/>
<chmod file="${lib.dir}/apr-util-${aprutil.version}/xml/expat/configure"
perm="u+x"/>
@@ -1163,7 +1166,7 @@
<target name="fixcrlf" depends="init" description="repair end-of-line
sequences">
<fixcrlf srcDir="${base.dir}" tab="remove" tablength="3"
- eof="remove" fixlast="true" eol="unix" includes="**/*.cpp **/*.h"
excludes="lib/**/*"/>
+ eof="remove" fixlast="true" eol="unix" includes="*.xml **/*.cpp **/*.h"
excludes="lib/**/*"/>
</target>
</project>
