fixed bug #42502 va_* cannot detect.

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 689e52726c62f447ee395e1a15d26b23d848ebd4..5c1fb176e93f407b0dbaeba687e2fb2e41342ff7 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -75,7 +75,7 @@ int main() { return foo(10, "", 3.14); }
       ], [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 @@ int main() { return foo(10, "", 3.14); }
     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])

diff --git a/ext/mbstring/oniguruma/php_onig_compat.h b/ext/mbstring/oniguruma/php_onig_compat.h
index 1de0d6073dc8e5af1ca43b00de2aa8fdf9197646..94ece40ef21a07c9401db7ccd5d5b3f55ce9574d 100644 (file)
--- a/ext/mbstring/oniguruma/php_onig_compat.h
+++ b/ext/mbstring/oniguruma/php_onig_compat.h
@@ -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 */