tony2001 Wed Oct 26 09:52:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.51.2.3&r2=1.51.2.4&ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.51.2.3
php-src/ext/mbstring/config.m4:1.51.2.4
--- php-src/ext/mbstring/config.m4:1.51.2.3 Sun Feb 20 18:02:48 2005
+++ php-src/ext/mbstring/config.m4 Wed Oct 26 09:51:58 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.51.2.3 2005/02/20 23:02:48 moriyoshi Exp $
+dnl $Id: config.m4,v 1.51.2.4 2005/10/26 13:51:58 tony2001 Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -55,7 +55,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);
@@ -65,7 +66,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.1760.2.505&r2=1.1760.2.506&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.505 php-src/NEWS:1.1760.2.506
--- php-src/NEWS:1.1760.2.505 Mon Oct 24 03:45:48 2005
+++ php-src/NEWS Wed Oct 26 09:51:58 2005
@@ -4,6 +4,7 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number > field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony)
- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
leaks). (Tony)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
