You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2019/11/07 11:01:48 UTC
svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Author: ylavic
Date: Thu Nov 7 11:01:48 2019
New Revision: 1869499
URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
Log:
Use latest/compatible apr_common.m4.
Modified:
httpd/httpd/trunk/build/apr_common.m4
Modified: httpd/httpd/trunk/build/apr_common.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/apr_common.m4?rev=1869499&r1=1869498&r2=1869499&view=diff
==============================================================================
--- httpd/httpd/trunk/build/apr_common.m4 (original)
+++ httpd/httpd/trunk/build/apr_common.m4 Thu Nov 7 11:01:48 2019
@@ -511,9 +511,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
[int main(int argc, const char *const *argv) {]
[[$2]]
[ return 0; }]
- )],
- [$3], [$4])
- CFLAGS=$apr_save_CFLAGS
+ )], [CFLAGS=$apr_save_CFLAGS
+$3], [CFLAGS=$apr_save_CFLAGS
+$4])
])
dnl
@@ -975,11 +975,44 @@ AC_SUBST(MKDEP)
])
dnl
+dnl APR_CHECK_TYPES_FMT_COMPATIBLE(TYPE-1, TYPE-2, FMT-TAG,
+dnl [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl
+dnl Try to determine whether two types are the same and accept the given
+dnl printf formatter (bare token, e.g. literal d, ld, etc).
+dnl
+AC_DEFUN([APR_CHECK_TYPES_FMT_COMPATIBLE], [
+define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2], [ ], [_])_[][$3])
+AC_CACHE_CHECK([whether $1 and $2 use fmt %$3], apr_cvname, [
+APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+], [
+ $1 chk1, *ptr1;
+ $2 chk2, *ptr2 = &chk1;
+ ptr1 = &chk2;
+ *ptr1 = *ptr2 = 0;
+ printf("%$3 %$3", chk1, chk2);
+], [apr_cvname=yes], [apr_cvname=no])])
+if test "$apr_cvname" = "yes"; then
+ :
+ $4
+else
+ :
+ $5
+fi
+])
+
+dnl
dnl APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, [ACTION-IF-TRUE])
dnl
dnl Try to determine whether two types are the same. Only works
dnl for gcc and icc.
dnl
+dnl @deprecated @see APR_CHECK_TYPES_FMT_COMPATIBLE
+dnl
AC_DEFUN([APR_CHECK_TYPES_COMPATIBLE], [
define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2], [ ], [_]))
AC_CACHE_CHECK([whether $1 and $2 are the same], apr_cvname, [
AW: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by "Pluem, Ruediger, Vodafone Group" <ru...@vodafone.com>.
+1.
This makes 3 +1 on list so we are now RTC and go for it :-).
Regards
Rüdiger
C2 General
> -----Ursprüngliche Nachricht-----
> Von: Stefan Eissing <st...@greenbytes.de>
> Gesendet: Donnerstag, 7. November 2019 13:14
> An: dev@httpd.apache.org
> Betreff: Re: svn commit: r1869499 -
> /httpd/httpd/trunk/build/apr_common.m4
>
> +1
>
> > Am 07.11.2019 um 13:12 schrieb Yann Ylavic <yl...@gmail.com>:
> >
> > Should I backport this removal to 2.4.x? CTR?
> >
> > On Thu, Nov 7, 2019 at 1:10 PM Yann Ylavic <yl...@gmail.com>
> wrote:
> >>
> >> r1869500
> >>
> >> On Thu, Nov 7, 2019 at 12:31 PM Pluem, Ruediger, Vodafone Group
> >> <ru...@vodafone.com> wrote:
> >>>
> >>> +1
> >>>
> >>> Regards
> >>>
> >>> Rüdiger
> >>>
> >>>
> >>> C2 General
> >>>
> >>>> -----Ursprüngliche Nachricht-----
> >>>> Von: Stefan Eissing <st...@greenbytes.de>
> >>>> Gesendet: Donnerstag, 7. November 2019 12:13
> >>>> An: dev@httpd.apache.org
> >>>> Betreff: Re: svn commit: r1869499 -
> >>>> /httpd/httpd/trunk/build/apr_common.m4
> >>>>
> >>>> +1
> >>>>
> >>>>> Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
> >>>>>
> >>>>> On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
> >>>>>>
> >>>>>> Author: ylavic
> >>>>>> Date: Thu Nov 7 11:01:48 2019
> >>>>>> New Revision: 1869499
> >>>>>>
> >>>>>> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
> >>>>>> Log:
> >>>>>> Use latest/compatible apr_common.m4.
> >>>>>
> >>>>> Or should we remove this file from the repository since it's
> generated
> >>>>> by ./buildconf?
Re: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by Stefan Eissing <st...@greenbytes.de>.
+1
> Am 07.11.2019 um 13:12 schrieb Yann Ylavic <yl...@gmail.com>:
>
> Should I backport this removal to 2.4.x? CTR?
>
> On Thu, Nov 7, 2019 at 1:10 PM Yann Ylavic <yl...@gmail.com> wrote:
>>
>> r1869500
>>
>> On Thu, Nov 7, 2019 at 12:31 PM Pluem, Ruediger, Vodafone Group
>> <ru...@vodafone.com> wrote:
>>>
>>> +1
>>>
>>> Regards
>>>
>>> Rüdiger
>>>
>>>
>>> C2 General
>>>
>>>> -----Ursprüngliche Nachricht-----
>>>> Von: Stefan Eissing <st...@greenbytes.de>
>>>> Gesendet: Donnerstag, 7. November 2019 12:13
>>>> An: dev@httpd.apache.org
>>>> Betreff: Re: svn commit: r1869499 -
>>>> /httpd/httpd/trunk/build/apr_common.m4
>>>>
>>>> +1
>>>>
>>>>> Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
>>>>>
>>>>> On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
>>>>>>
>>>>>> Author: ylavic
>>>>>> Date: Thu Nov 7 11:01:48 2019
>>>>>> New Revision: 1869499
>>>>>>
>>>>>> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
>>>>>> Log:
>>>>>> Use latest/compatible apr_common.m4.
>>>>>
>>>>> Or should we remove this file from the repository since it's generated
>>>>> by ./buildconf?
Re: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by Yann Ylavic <yl...@gmail.com>.
Should I backport this removal to 2.4.x? CTR?
On Thu, Nov 7, 2019 at 1:10 PM Yann Ylavic <yl...@gmail.com> wrote:
>
> r1869500
>
> On Thu, Nov 7, 2019 at 12:31 PM Pluem, Ruediger, Vodafone Group
> <ru...@vodafone.com> wrote:
> >
> > +1
> >
> > Regards
> >
> > Rüdiger
> >
> >
> > C2 General
> >
> > > -----Ursprüngliche Nachricht-----
> > > Von: Stefan Eissing <st...@greenbytes.de>
> > > Gesendet: Donnerstag, 7. November 2019 12:13
> > > An: dev@httpd.apache.org
> > > Betreff: Re: svn commit: r1869499 -
> > > /httpd/httpd/trunk/build/apr_common.m4
> > >
> > > +1
> > >
> > > > Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
> > > >
> > > > On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
> > > >>
> > > >> Author: ylavic
> > > >> Date: Thu Nov 7 11:01:48 2019
> > > >> New Revision: 1869499
> > > >>
> > > >> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
> > > >> Log:
> > > >> Use latest/compatible apr_common.m4.
> > > >
> > > > Or should we remove this file from the repository since it's generated
> > > > by ./buildconf?
Re: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by Yann Ylavic <yl...@gmail.com>.
r1869500
On Thu, Nov 7, 2019 at 12:31 PM Pluem, Ruediger, Vodafone Group
<ru...@vodafone.com> wrote:
>
> +1
>
> Regards
>
> Rüdiger
>
>
> C2 General
>
> > -----Ursprüngliche Nachricht-----
> > Von: Stefan Eissing <st...@greenbytes.de>
> > Gesendet: Donnerstag, 7. November 2019 12:13
> > An: dev@httpd.apache.org
> > Betreff: Re: svn commit: r1869499 -
> > /httpd/httpd/trunk/build/apr_common.m4
> >
> > +1
> >
> > > Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
> > >
> > > On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
> > >>
> > >> Author: ylavic
> > >> Date: Thu Nov 7 11:01:48 2019
> > >> New Revision: 1869499
> > >>
> > >> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
> > >> Log:
> > >> Use latest/compatible apr_common.m4.
> > >
> > > Or should we remove this file from the repository since it's generated
> > > by ./buildconf?
AW: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by "Pluem, Ruediger, Vodafone Group" <ru...@vodafone.com>.
+1
Regards
Rüdiger
C2 General
> -----Ursprüngliche Nachricht-----
> Von: Stefan Eissing <st...@greenbytes.de>
> Gesendet: Donnerstag, 7. November 2019 12:13
> An: dev@httpd.apache.org
> Betreff: Re: svn commit: r1869499 -
> /httpd/httpd/trunk/build/apr_common.m4
>
> +1
>
> > Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
> >
> > On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
> >>
> >> Author: ylavic
> >> Date: Thu Nov 7 11:01:48 2019
> >> New Revision: 1869499
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
> >> Log:
> >> Use latest/compatible apr_common.m4.
> >
> > Or should we remove this file from the repository since it's generated
> > by ./buildconf?
Re: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by Stefan Eissing <st...@greenbytes.de>.
+1
> Am 07.11.2019 um 12:04 schrieb Yann Ylavic <yl...@gmail.com>:
>
> On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
>>
>> Author: ylavic
>> Date: Thu Nov 7 11:01:48 2019
>> New Revision: 1869499
>>
>> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
>> Log:
>> Use latest/compatible apr_common.m4.
>
> Or should we remove this file from the repository since it's generated
> by ./buildconf?
Re: svn commit: r1869499 - /httpd/httpd/trunk/build/apr_common.m4
Posted by Yann Ylavic <yl...@gmail.com>.
On Thu, Nov 7, 2019 at 12:01 PM <yl...@apache.org> wrote:
>
> Author: ylavic
> Date: Thu Nov 7 11:01:48 2019
> New Revision: 1869499
>
> URL: http://svn.apache.org/viewvc?rev=1869499&view=rev
> Log:
> Use latest/compatible apr_common.m4.
Or should we remove this file from the repository since it's generated
by ./buildconf?