Author: carnold
Date: Tue Nov 1 12:44:43 2005
New Revision: 330119
URL: http://svn.apache.org/viewcvs?rev=330119&view=rev
Log:
LOGCXX-114: Upgrade APR to 1.2.2 from 1.1.0
Added:
logging/log4cxx/trunk/apr-1.2.2.patch
- copied unchanged from r329928, logging/log4cxx/trunk/apr-1.1.0.patch
logging/log4cxx/trunk/apr-util-1.2.2.patch (with props)
Removed:
logging/log4cxx/trunk/apr-1.1.0.patch
logging/log4cxx/trunk/apr-iconv-1.0.1.patch
Modified:
logging/log4cxx/trunk/ (props changed)
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/include/log4cxx/ (props changed)
logging/log4cxx/trunk/include/log4cxx/private/ (props changed)
Propchange: logging/log4cxx/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 1 12:44:43 2005
@@ -1,16 +1,2 @@
-Makefile
-Makefile.in
-configure
build
-.cdtproject
-aclocal.m4
-autom4te.cache
-bak
lib
-libtool
-linux
-log4cxx.cbx
-log4cxx.cbx.local
-xcode
-cbx
-msvc
Added: 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=330119&view=auto
==============================================================================
--- logging/log4cxx/trunk/apr-util-1.2.2.patch (added)
+++ logging/log4cxx/trunk/apr-util-1.2.2.patch Tue Nov 1 12:44:43 2005
@@ -0,0 +1,22 @@
+Index: dbd/apr_dbd.c
+===================================================================
+--- dbd/apr_dbd.c (revision 330107)
++++ dbd/apr_dbd.c (working copy)
+@@ -160,7 +160,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_null);
+ }
+ return ret;
+@@ -169,7 +169,7 @@
+ apr_pool_t *pool,
+ 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);
+ return driver->end_transaction(trans);
+ }
+
Propchange: logging/log4cxx/trunk/apr-util-1.2.2.patch
------------------------------------------------------------------------------
svn:executable = *
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/build.xml?rev=330119&r1=330118&r2=330119&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Nov 1 12:44:43 2005
@@ -61,11 +61,11 @@
-<property name="apr.version" value="1.1.0"/>
+<property name="apr.version" value="1.2.2"/>
<property name="apr.lib.name" value="apr-1"/>
<property name="apr.lib.type" value="static"/>
-<property name="aprutil.version" value="1.1.0"/>
+<property name="aprutil.version" value="1.2.2"/>
<property name="aprutil.lib.name" value="aprutil-1"/>
<property name="aprutil.lib.type" value="static"/>
Propchange: logging/log4cxx/trunk/include/log4cxx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 1 12:44:43 2005
@@ -1,8 +1 @@
-Makefile
-Makefile.in
-config_auto_log4cxx.h
-config_auto.h
-config_auto.h.in
-config_msvc.h
-config.h
-stamp-h1
+log4cxx.h
Propchange: logging/log4cxx/trunk/include/log4cxx/private/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 1 12:44:43 2005
@@ -0,0 +1 @@
+log4cxx_private.h
