Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of trawick@gmail.com designates
 209.85.215.50 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20110808093305.A8B7123889B3@eris.apache.org>
References: <20110808093305.A8B7123889B3@eris.apache.org>
Date: Mon, 8 Aug 2011 09:16:43 -0400
Message-ID: 
 <CAKUrXK4FEufXa7aGdOcA+V64NvwAMj7=vHdR4T2AxvKurxyNrw@mail.gmail.com>
Subject: Re: 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/
From: Jeff Trawick <trawick@gmail.com>
To: dev@apr.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Mon, Aug 8, 2011 at 5:33 AM,  <bojan@apache.org> wrote:
> Author: bojan
> Date: Mon Aug =A08 09:33:05 2011
> New Revision: 1154890
>
> URL: http://svn.apache.org/viewvc?rev=3D1154890&view=3Drev
> 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.

Is the end result that the test previously failed to find
ldap_set_rebind_proc() but now works with GCC 4.6?  If so, that's what
CHANGES should say.  (We quietly fix warnings all the time; my
semi-educated guess is that this is more interesting.)

>
> Modified:
> =A0 =A0apr/apr-util/branches/1.5.x/ =A0 (props changed)
> =A0 =A0apr/apr-util/branches/1.5.x/buckets/apr_brigade.c =A0 (props chang=
ed)
> =A0 =A0apr/apr-util/branches/1.5.x/build/apu-conf.m4
> =A0 =A0apr/apr-util/branches/1.5.x/misc/apr_queue.c =A0 (props changed)
> =A0 =A0apr/apr-util/branches/1.5.x/xml/expat/ =A0 (props changed)
>
> Propchange: apr/apr-util/branches/1.5.x/
> -------------------------------------------------------------------------=
-----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Aug =A08 09:33:05 2011
> @@ -1,3 +1,3 @@
> =A0/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
> =A0/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,7=
43986,744009,745771,747612,747623,747630
>
> Propchange: apr/apr-util/branches/1.5.x/buckets/apr_brigade.c
> -------------------------------------------------------------------------=
-----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Aug =A08 09:33:05 2011
> @@ -1,3 +1,3 @@
> =A0/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,78459=
2,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
> =A0/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-c=
onf.m4?rev=3D1154890&r1=3D1154889&r2=3D1154890&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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 =A08 09:33:05 2=
011
> @@ -391,9 +391,7 @@ if test "$apu_has_ldap_openldap" =3D "1";
> =A0 =A0 #include <ldap.h>
> =A0 =A0 #endif
> =A0 =A0 ], [
> - =A0 =A0int tmp =3D ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)=
0, (void *)0);
> - =A0 =A0/* use tmp to suppress the warning */
> - =A0 =A0tmp=3D0;
> + =A0 =A0ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)0, (void *)0=
);
> =A0 =A0 ], ac_cv_ldap_set_rebind_proc_style=3Dthree, ac_cv_ldap_set_rebin=
d_proc_style=3Dtwo))
>
> =A0 =A0 if test "$ac_cv_ldap_set_rebind_proc_style" =3D "three"; then
>
> Propchange: apr/apr-util/branches/1.5.x/misc/apr_queue.c
> -------------------------------------------------------------------------=
-----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Aug =A08 09:33:05 2011
> @@ -1,4 +1,4 @@
> =A0/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794=
508,917837-917838
> =A0/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
> =A0/apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,73129=
1,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 =A08 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
> =A0/apr/apr-util/vendor/expat/1.95.7:1002560-1002564
> =A0/apr/apr-util/vendor/expat/current:1002513-1002559
>
>
>


--=20
Born in Roswell... married an alien...