Commit f848794e authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Revert r1856560: was not the latest apr_common.m4 version anyway... 

How does that change came in my local workspace in the first place??


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856561 13f79535-47bb-0310-9956-ffa450edef68
parent fe1ababa

build/apr_common.m4

+3 −36
Original line number Diff line number Diff line
@@ -511,9 +511,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], 
   [int main(int argc, const char *const *argv) {]

   [[$2]]

   [   return 0; }]

  )], [CFLAGS=$apr_save_CFLAGS

$3],  [CFLAGS=$apr_save_CFLAGS

$4])

  )],

  [$3], [$4])

 CFLAGS=$apr_save_CFLAGS

])



dnl
@@ -974,45 +974,12 @@ fi 
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, [