apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r1154889 - in /apr/apr-util/branches/1.4.x: ./ CHANGES buckets/apr_brigade.c build/apu-conf.m4 dbd/apr_dbd_pgsql.c misc/apr_queue.c test/NWGNUaputest xml/expat/
Date Mon, 08 Aug 2011 09:32:28 GMT
Author: bojan
Date: Mon Aug  8 09:32:27 2011
New Revision: 1154889

URL: http://svn.apache.org/viewvc?rev=1154889&view=rev
Log:
Merge 1154885 and r1154887 to 1.4.x.
Avoid compiler warning in ldap_set_rebind_proc() test.
It seems that GCC 4.6 understands that tmp was really never used.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/CHANGES   (contents, props changed)
    apr/apr-util/branches/1.4.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.4.x/build/apu-conf.m4
    apr/apr-util/branches/1.4.x/dbd/apr_dbd_pgsql.c   (props changed)
    apr/apr-util/branches/1.4.x/misc/apr_queue.c   (props changed)
    apr/apr-util/branches/1.4.x/test/NWGNUaputest   (props changed)
    apr/apr-util/branches/1.4.x/xml/expat/   (props changed)

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,4 +1,4 @@
 /apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838
-/apr/apr-util/branches/1.3.x:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=1154889&r1=1154888&r2=1154889&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Mon Aug  8 09:32:27 2011
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.0
 
+  *) Avoid compiler warning in ldap_set_rebind_proc() test.
+     [Bojan Smojver]
+
   *) apr_thread_pool: Fix thread unsafe pool usage. [Stefan Fritsch]
 
   *) Do not include apr.h and apr_errno.h from system search path in

Propchange: apr/apr-util/branches/1.4.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -0,0 +1,5 @@
+/apr/apr/trunk/CHANGES:781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x:1154887
+/apr/apr-util/branches/1.3.x/CHANGES:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
+/apr/apr-util/branches/1.5.x/CHANGES:1002504,1002584-1002585,1002620,1002622-1002623,1002628
+/apr/apr-util/trunk/CHANGES:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,4 +1,4 @@
 /apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837-917838
-/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.4.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/apu-conf.m4?rev=1154889&r1=1154888&r2=1154889&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/apu-conf.m4 Mon Aug  8 09:32:27 2011
@@ -391,9 +391,7 @@ if test "$apu_has_ldap_openldap" = "1"; 
     #include <ldap.h>
     #endif
     ], [
-    int tmp = ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)0, (void *)0);
-    /* use tmp to suppress the warning */
-    tmp=0;
+    ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)0, (void *)0);
     ], ac_cv_ldap_set_rebind_proc_style=three, ac_cv_ldap_set_rebind_proc_style=two))
 
     if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then

Propchange: apr/apr-util/branches/1.4.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,2 +1,2 @@
-/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:896410,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:896410,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628

Propchange: apr/apr-util/branches/1.4.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,5 +1,5 @@
 /apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr/trunk/util-misc/apr_queue.c:784520
-/apr/apr-util/branches/1.3.x/misc/apr_queue.c:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x/misc/apr_queue.c:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.4.x/test/NWGNUaputest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,2 +1,2 @@
-/apr/apr-util/branches/1.3.x/test/NWGNUaputest:896410,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x/test/NWGNUaputest:896410,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002504,1002584-1002585,1002620,1002622-1002623,1002628

Propchange: apr/apr-util/branches/1.4.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:32:27 2011
@@ -1,5 +1,5 @@
 /apr/apr/trunk/xml/expat:781403,781409,784519,784592,789965,794508,917837-917838
-/apr/apr-util/branches/1.3.x/xml/expat:692751,896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.3.x/xml/expat:692751,896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
 /apr/apr-util/branches/1.5.x/xml/expat:1002504,1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/xml/expat:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630,781403
 /apr/apr-util/vendor/expat/1.95.7:1002560-1002564



Mime
View raw message