From b122cd4b089063dd8842492513c855654e42b03e Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 26 Oct 2005 13:50:39 +0000 Subject: [PATCH] MFH: fix #34977 (Compile failure on MacOSX due to use of varargs.h) --- NEWS | 1 + ext/mbstring/config.m4 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 3307c6bfa89..7186bb46779 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Oct 2005, PHP 5.1 Release Candidate 4 - Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry) +- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony) - Fixed bug #34968 (bz2 extension fails on to build on some win32 setups). (Ilia) - Fixed bug #34965 (tidy is not binary safe). (Mike) diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index aefc7b55f04..12970e30af1 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -61,7 +61,8 @@ EOF AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ if test "$PHP_MBREGEX" = "yes"; then AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [ - AC_TRY_COMPILE([#include ], [ + AC_TRY_RUN([ +#include int foo(int x, ...) { va_list va; va_start(va, x); @@ -71,7 +72,7 @@ int foo(int x, ...) { return 0; } int main() { return foo(10, "", 3.14); } - ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no]) + ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [cv_php_mbstring_stdarg=no]) ]) AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h])