apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r1154890 - in /apr/apr-util/branches/1.5.x: ./ buckets/apr_brigade.c build/apu-conf.m4 misc/apr_queue.c xml/expat/
Date Mon, 08 Aug 2011 09:33:05 GMT
Author: bojan
Date: Mon Aug  8 09:33:05 2011
New Revision: 1154890

URL: http://svn.apache.org/viewvc?rev=1154890&view=rev
Log:
Merge 1154885 and r1154887 to 1.5.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.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.5.x/build/apu-conf.m4
    apr/apr-util/branches/1.5.x/misc/apr_queue.c   (props changed)
    apr/apr-util/branches/1.5.x/xml/expat/   (props changed)

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:33:05 2011
@@ -1,3 +1,3 @@
 /apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648,1128838,1129433,1133587
-/apr/apr-util/branches/1.3.x:896410
+/apr/apr-util/branches/1.3.x:896410,1154885
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.5.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:33:05 2011
@@ -1,3 +1,3 @@
 /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
+/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:896410,1154885
 /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.5.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/apu-conf.m4?rev=1154890&r1=1154889&r2=1154890&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/apu-conf.m4 Mon Aug  8 09:33:05 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.5.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:33:05 2011
@@ -1,4 +1,4 @@
 /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
+/apr/apr-util/branches/1.3.x/misc/apr_queue.c:896410,1154885
 /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.5.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  8 09:33:05 2011
@@ -1,3 +1,3 @@
-/apr/apr-util/branches/1.3.x/xml/expat:896410
+/apr/apr-util/branches/1.3.x/xml/expat:896410,1154885
 /apr/apr-util/vendor/expat/1.95.7:1002560-1002564
 /apr/apr-util/vendor/expat/current:1002513-1002559



Mime
View raw message