hirokawa Tue Sep 18 21:35:13 2007 UTC
Modified files:
/php-src/ext/mbstring config.m4
/php-src/ext/mbstring/oniguruma php_onig_compat.h
Log:
fixed bug #42502 va_* cannot detect.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.66&r2=1.67&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.66 php-src/ext/mbstring/config.m4:1.67
--- php-src/ext/mbstring/config.m4:1.66 Tue Jul 31 12:23:42 2007
+++ php-src/ext/mbstring/config.m4 Tue Sep 18 21:35:12 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.66 2007/07/31 12:23:42 tony2001 Exp $
+dnl $Id: config.m4,v 1.67 2007/09/18 21:35:12 hirokawa Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -75,7 +75,7 @@
], [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])
+ AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h
sys/times.h stdarg.h])
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(long, 4)
@@ -84,9 +84,6 @@
AC_FUNC_ALLOCA
AC_FUNC_MEMCMP
- if test "$cv_php_mbstring_stdarg" = "yes"; then
- AC_DEFINE([HAVE_STDARG_PROTOTYPES], 1, [Define if stdarg.h is available])
- fi
AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/php_onig_compat.h?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mbstring/oniguruma/php_onig_compat.h
diff -u php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2
php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.3
--- php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2 Mon Feb 21
09:43:55 2005
+++ php-src/ext/mbstring/oniguruma/php_onig_compat.h Tue Sep 18 21:35:13 2007
@@ -5,4 +5,10 @@
#define regex_t php_mb_regex_t
#define re_registers php_mb_re_registers
+#ifdef HAVE_STDARG_H
+#ifndef HAVE_STDARG_PROTOTYPES
+#define HAVE_STDARG_PROTOTYPES 1
+#endif
+#endif
+
#endif /* _PHP_MBREGEX_COMPAT_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
