apr_common.m4 (apr-1.6.5.tar.bz2) | : | apr_common.m4 (apr-1.7.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 506 | skipping to change at line 506 | |||
CFLAGS="$CFLAGS -Werror" | CFLAGS="$CFLAGS -Werror" | |||
fi | fi | |||
AC_COMPILE_IFELSE( | AC_COMPILE_IFELSE( | |||
[AC_LANG_SOURCE( | [AC_LANG_SOURCE( | |||
[#include "confdefs.h" | [#include "confdefs.h" | |||
] | ] | |||
[[$1]] | [[$1]] | |||
[int main(int argc, const char *const *argv) {] | [int main(int argc, const char *const *argv) {] | |||
[[$2]] | [[$2]] | |||
[ return 0; }] | [ return 0; }] | |||
)], | )], [CFLAGS=$apr_save_CFLAGS | |||
[$3], [$4]) | $3], [CFLAGS=$apr_save_CFLAGS | |||
CFLAGS=$apr_save_CFLAGS | $4]) | |||
]) | ]) | |||
dnl | dnl | |||
dnl APR_CHECK_STRERROR_R_RC | dnl APR_CHECK_STRERROR_R_RC | |||
dnl | dnl | |||
dnl Decide which style of retcode is used by this system's | dnl Decide which style of retcode is used by this system's | |||
dnl strerror_r(). It either returns int (0 for success, -1 | dnl strerror_r(). It either returns int (0 for success, -1 | |||
dnl for failure), or it returns a pointer to the error | dnl for failure), or it returns a pointer to the error | |||
dnl string. | dnl string. | |||
dnl | dnl | |||
skipping to change at line 969 | skipping to change at line 969 | |||
fi | fi | |||
AC_MSG_RESULT(no) | AC_MSG_RESULT(no) | |||
done | done | |||
rm -f conftest.c | rm -f conftest.c | |||
fi | fi | |||
AC_SUBST(MKDEP) | AC_SUBST(MKDEP) | |||
]) | ]) | |||
dnl | 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 APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, [ACTION-IF-TRUE]) | |||
dnl | dnl | |||
dnl Try to determine whether two types are the same. Only works | dnl Try to determine whether two types are the same. Only works | |||
dnl for gcc and icc. | dnl for gcc and icc. | |||
dnl | dnl | |||
dnl @deprecated @see APR_CHECK_TYPES_FMT_COMPATIBLE | ||||
dnl | ||||
AC_DEFUN([APR_CHECK_TYPES_COMPATIBLE], [ | AC_DEFUN([APR_CHECK_TYPES_COMPATIBLE], [ | |||
define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2] , [ ], [_])) | define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2] , [ ], [_])) | |||
AC_CACHE_CHECK([whether $1 and $2 are the same], apr_cvname, [ | AC_CACHE_CHECK([whether $1 and $2 are the same], apr_cvname, [ | |||
AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [ | AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [ | |||
int foo[0 - !__builtin_types_compatible_p($1, $2)]; | int foo[0 - !__builtin_types_compatible_p($1, $2)]; | |||
], [apr_cvname=yes | ], [apr_cvname=yes | |||
$3], [apr_cvname=no])]) | $3], [apr_cvname=no])]) | |||
]) | ]) | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 37 lines changed or added |