tony2001 Wed Oct 26 09:50:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring config.m4
/php-src NEWS
Log:
MFH: fix #34977 (Compile failure on MacOSX due to use of varargs.h)
http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.58&r2=1.58.2.1&ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58
php-src/ext/mbstring/config.m4:1.58.2.1
--- php-src/ext/mbstring/config.m4:1.58 Sun May 29 19:15:16 2005
+++ php-src/ext/mbstring/config.m4 Wed Oct 26 09:50:39 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.58 2005/05/29 23:15:16 sniper Exp $
+dnl $Id: config.m4,v 1.58.2.1 2005/10/26 13:50:39 tony2001 Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -61,7 +61,8 @@
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 <stdarg.h>], [
+ AC_TRY_RUN([
+#include <stdarg.h>
int foo(int x, ...) {
va_list va;
va_start(va, x);
@@ -71,7 +72,7 @@
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])
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.162&r2=1.2027.2.163&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.162 php-src/NEWS:1.2027.2.163
--- php-src/NEWS:1.2027.2.162 Tue Oct 25 14:04:59 2005
+++ php-src/NEWS Wed Oct 26 09:50:39 2005
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
