diff options
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/config.m4 | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_allocators.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_encoding.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_language.c | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 4e71f1befe..7de3ed9a81 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -34,7 +34,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ PHP_ADD_BUILD_DIR([$ext_builddir/$dir]) done - if test "$ext_shared" = "no"; then + if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then out="php_config.h" else out="$abs_builddir/config.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index cc13d1544c..be9d345b06 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -28,8 +28,6 @@ * */ -#include "php.h" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index a63ea370c4..7f0dc9ab60 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -28,8 +28,6 @@ * */ -#include "php.h" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 5f55a45e23..be1341ab8c 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -28,8 +28,6 @@ * */ -#include "php.h" - #ifdef HAVE_CONFIG_H #include "config.h" #endif |