com php-src: Remove HAVE_STDDEF_H: ext/mbstring/libmbfl /config.h.in ext/mbstring/libmbfl/config.h.w32 ext/mbstring/libmbfl/mbfl/mbfilter.c
ext/mbstring/libmbfl/m bfl/mbfilter_8bit.c ext/mbstring/libmbfl/mbfl/mbfilter _pass.c ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c
ext/mbstring/libmbfl/mbfl/mbfl_allocators.c ext/mbstring/ libmbfl/mbfl/mbfl_convert.c ext/mbstring/libmbfl/mbfl/mbf l_encoding.c
ext/mbstring/libmbfl/mbfl/mbfl_ident.c ext/mbstring/libmb
| From: | Joe Watkins | Date: | Wed, 05 Sep 2018 09:51:19 +0000 |
| Subject: | com php-src: Remove HAVE_STDDEF_H: ext/mbstring/libmbfl /config.h.in ext/mbstring/libmbfl/config.h.w32 ext/mbstring/libmbfl/mbfl/mbfilter.c ext/mbstring/libmbfl/m bfl/mbfilter_8bit.c ext/mbstring/libmbfl/mbfl/mbfilter _pass.c ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c ext/mbstring/libmbfl/mbfl/mbfl_allocators.c ext/mbstring/ libmbfl/mbfl/mbfl_convert.c ext/mbstring/libmbfl/mbfl/mbf l_encoding.c ext/mbstring/libmbfl/mbfl/mbfl_ident.c ext/mbstring/libmb |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103004@lists.php.net to get a copy of this message | ||
Commit: 6c1ff61a368a26c8f2cbf383aa8a26fc30cf59ef
Author: Peter Kokot <peterkokot@gmail.com> Wed, 5 Sep 2018 02:53:12 +0200
Committer: Joe Watkins <krakjoe@php.net> Wed, 5 Sep 2018 11:51:19 +0200
Parents: 3b1b0c589d72763940525197f4ed73b32836f483
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6c1ff61a368a26c8f2cbf383aa8a26fc30cf59ef
Log:
Remove HAVE_STDDEF_H
The
diff --git a/ext/mbstring/libmbfl/config.h.in b/ext/mbstring/libmbfl/config.h.in index 867df52..c30fa09 100644 --- a/ext/mbstring/libmbfl/config.h.in +++ b/ext/mbstring/libmbfl/config.h.in @@ -20,9 +20,6 @@ and to 0 otherwise. */ #undef HAVE_REALLOC -/* Define to 1 if you have the <stddef.h> header file. */ -#undef HAVE_STDDEF_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff --git a/ext/mbstring/libmbfl/config.h.w32 b/ext/mbstring/libmbfl/config.h.w32 index 7458e44..14393a0 100644 --- a/ext/mbstring/libmbfl/config.h.w32 +++ b/ext/mbstring/libmbfl/config.h.w32 @@ -1,6 +1,5 @@ #define HAVE_STDIO_H 1 #define HAVE_STDLIB_H 1 -#define HAVE_STDDEF_H 1 #define HAVE_ASSERT_H 1 #define HAVE_MEMORY_H 1 /* #undef HAVE_STRINGS_H */ diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 48dbc75..56f03b6 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -94,10 +94,6 @@ #include <strings.h> #endif -#ifdef HAVE_STDDEF_H -#include <stddef.h> -#endif - #include "mbfilter.h" #include "mbfl_filter_output.h" #include "mbfilter_8bit.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 4faa9b8..b38e408 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index a9c6fd4..24392e0 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -31,9 +31,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "mbfilter_pass.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index 97142a1..b313cf5 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index aa468da..070bee6 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -48,9 +48,7 @@ #include <strings.h> #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 7a0fb60..9e900dd 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_encoding.h" #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index 77c5dae..a136723 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #ifdef HAVE_STRING_H #include <string.h> diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index 9f8e780..ce7cf13 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_ident.h" #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 9ca2d59..ca03079 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -32,13 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif - -#ifdef HAVE_STDDEF_H -#include <stddef.h> -#endif #ifdef HAVE_STRING_H #include <string.h> diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c index bfa477f..0dd8ea2 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include <string.h> #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index b262265..b0f86e9 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_allocators.h" #include "mbfl_string.h" diff --git a/ext/mbstring/libmbfl/nls/nls_de.c b/ext/mbstring/libmbfl/nls/nls_de.c index b559e2d..7fb7a26 100644 --- a/ext/mbstring/libmbfl/nls/nls_de.c +++ b/ext/mbstring/libmbfl/nls/nls_de.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_de.h" diff --git a/ext/mbstring/libmbfl/nls/nls_en.c b/ext/mbstring/libmbfl/nls/nls_en.c index 0700e4f..46a647a 100644 --- a/ext/mbstring/libmbfl/nls/nls_en.c +++ b/ext/mbstring/libmbfl/nls/nls_en.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_en.h" diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c index 1c4b383..7344abb 100644 --- a/ext/mbstring/libmbfl/nls/nls_hy.c +++ b/ext/mbstring/libmbfl/nls/nls_hy.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_hy.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ja.c b/ext/mbstring/libmbfl/nls/nls_ja.c index d5541fa..c3b3694 100644 --- a/ext/mbstring/libmbfl/nls/nls_ja.c +++ b/ext/mbstring/libmbfl/nls/nls_ja.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_ja.h" diff --git a/ext/mbstring/libmbfl/nls/nls_kr.c b/ext/mbstring/libmbfl/nls/nls_kr.c index afff43a..3b1a7ad 100644 --- a/ext/mbstring/libmbfl/nls/nls_kr.c +++ b/ext/mbstring/libmbfl/nls/nls_kr.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_kr.h" diff --git a/ext/mbstring/libmbfl/nls/nls_neutral.c b/ext/mbstring/libmbfl/nls/nls_neutral.c index 87a6a19..8abd3e9 100644 --- a/ext/mbstring/libmbfl/nls/nls_neutral.c +++ b/ext/mbstring/libmbfl/nls/nls_neutral.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_neutral.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ru.c b/ext/mbstring/libmbfl/nls/nls_ru.c index 7e4cf9c..c452630 100644 --- a/ext/mbstring/libmbfl/nls/nls_ru.c +++ b/ext/mbstring/libmbfl/nls/nls_ru.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_ru.h" diff --git a/ext/mbstring/libmbfl/nls/nls_tr.c b/ext/mbstring/libmbfl/nls/nls_tr.c index c7044ff..1d17bd2 100644 --- a/ext/mbstring/libmbfl/nls/nls_tr.c +++ b/ext/mbstring/libmbfl/nls/nls_tr.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_tr.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ua.c b/ext/mbstring/libmbfl/nls/nls_ua.c index 85fe9b4..8f75b34 100644 --- a/ext/mbstring/libmbfl/nls/nls_ua.c +++ b/ext/mbstring/libmbfl/nls/nls_ua.c @@ -2,11 +2,7 @@ #include "config.h" #endif - -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif - #include "mbfilter.h" #include "nls_ua.h" diff --git a/ext/mbstring/libmbfl/nls/nls_uni.c b/ext/mbstring/libmbfl/nls/nls_uni.c index 6a01001..d4fb42c 100644 --- a/ext/mbstring/libmbfl/nls/nls_uni.c +++ b/ext/mbstring/libmbfl/nls/nls_uni.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_uni.h" diff --git a/ext/mbstring/libmbfl/nls/nls_zh.c b/ext/mbstring/libmbfl/nls/nls_zh.c index d9a4993..2de9015 100644 --- a/ext/mbstring/libmbfl/nls/nls_zh.c +++ b/ext/mbstring/libmbfl/nls/nls_zh.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_zh.h" diff --git a/main/php_network.h b/main/php_network.h index 4d6b18f..296be2b 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -89,9 +89,7 @@ END_EXTERN_C() #include <sys/time.h> #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #ifdef PHP_WIN32 typedef SOCKET php_socket_t;
<stddef.h> header file is part of the standard C89 headers [1] and
on current systems there is no need for a manual check if header is
present.
Since PHP requires at least C89 the HAVE_STDDEF_H symbol isn't defined
by Autoconf anywhere else anymore [2] and accross the PHP source code
the header is included unconditionally already.
This patch syncs this also for the bundled libmbfl which is maintaned as
a fork in php-src.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Bugs:
https://bugs.php.net/4
Changed paths:
M ext/mbstring/libmbfl/config.h.in
M ext/mbstring/libmbfl/config.h.w32
M ext/mbstring/libmbfl/mbfl/mbfilter.c
M ext/mbstring/libmbfl/mbfl/mbfilter_8bit..c
M ext/mbstring/libmbfl/mbfl/mbfilter_pass.c
M ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c
M ext/mbstring/libmbfl/mbfl/mbfl_allocators..c
M ext/mbstring/libmbfl/mbfl/mbfl_convert.c
M ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
M ext/mbstring/libmbfl/mbfl/mbfl_ident.c
M ext/mbstring/libmbfl/mbfl/mbfl_language.c
M ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c
M ext/mbstring/libmbfl/mbfl/mbfl_string.c
M ext/mbstring/libmbfl/nls/nls_de.c
M ext/mbstring/libmbfl/nls/nls_en..c
M ext/mbstring/libmbfl/nls/nls_hy.c
M ext/mbstring/libmbfl/nls/nls_ja.c
M ext/mbstring/libmbfl/nls/nls_kr.c
M ext/mbstring/libmbfl/nls/nls_neutral.c
M ext/mbstring/libmbfl/nls/nls_ru.c
M ext/mbstring/libmbfl/nls/nls_tr.c
M ext/mbstring/libmbfl/nls/nls_ua.c
M ext/mbstring/libmbfl/nls/nls_uni.c
M ext/mbstring/libmbfl/nls/nls_zh..c
M main/php_network.h
diff --git a/ext/mbstring/libmbfl/config.h.in b/ext/mbstring/libmbfl/config.h.in index 867df52..c30fa09 100644 --- a/ext/mbstring/libmbfl/config.h.in +++ b/ext/mbstring/libmbfl/config.h.in @@ -20,9 +20,6 @@ and to 0 otherwise. */ #undef HAVE_REALLOC -/* Define to 1 if you have the <stddef.h> header file. */ -#undef HAVE_STDDEF_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff --git a/ext/mbstring/libmbfl/config.h.w32 b/ext/mbstring/libmbfl/config.h.w32 index 7458e44..14393a0 100644 --- a/ext/mbstring/libmbfl/config.h.w32 +++ b/ext/mbstring/libmbfl/config.h.w32 @@ -1,6 +1,5 @@ #define HAVE_STDIO_H 1 #define HAVE_STDLIB_H 1 -#define HAVE_STDDEF_H 1 #define HAVE_ASSERT_H 1 #define HAVE_MEMORY_H 1 /* #undef HAVE_STRINGS_H */ diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 48dbc75..56f03b6 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -94,10 +94,6 @@ #include <strings.h> #endif -#ifdef HAVE_STDDEF_H -#include <stddef.h> -#endif - #include "mbfilter.h" #include "mbfl_filter_output.h" #include "mbfilter_8bit.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 4faa9b8..b38e408 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index a9c6fd4..24392e0 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -31,9 +31,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "mbfilter_pass.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index 97142a1..b313cf5 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index aa468da..070bee6 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -48,9 +48,7 @@ #include <strings.h> #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 7a0fb60..9e900dd 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_encoding.h" #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index 77c5dae..a136723 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #ifdef HAVE_STRING_H #include <string.h> diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index 9f8e780..ce7cf13 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_ident.h" #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 9ca2d59..ca03079 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -32,13 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif - -#ifdef HAVE_STDDEF_H -#include <stddef.h> -#endif #ifdef HAVE_STRING_H #include <string.h> diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c index bfa477f..0dd8ea2 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include <string.h> #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index b262265..b0f86e9 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -32,9 +32,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfl_allocators.h" #include "mbfl_string.h" diff --git a/ext/mbstring/libmbfl/nls/nls_de.c b/ext/mbstring/libmbfl/nls/nls_de.c index b559e2d..7fb7a26 100644 --- a/ext/mbstring/libmbfl/nls/nls_de.c +++ b/ext/mbstring/libmbfl/nls/nls_de.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_de.h" diff --git a/ext/mbstring/libmbfl/nls/nls_en.c b/ext/mbstring/libmbfl/nls/nls_en.c index 0700e4f..46a647a 100644 --- a/ext/mbstring/libmbfl/nls/nls_en.c +++ b/ext/mbstring/libmbfl/nls/nls_en.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_en.h" diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c index 1c4b383..7344abb 100644 --- a/ext/mbstring/libmbfl/nls/nls_hy.c +++ b/ext/mbstring/libmbfl/nls/nls_hy.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_hy.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ja.c b/ext/mbstring/libmbfl/nls/nls_ja.c index d5541fa..c3b3694 100644 --- a/ext/mbstring/libmbfl/nls/nls_ja.c +++ b/ext/mbstring/libmbfl/nls/nls_ja.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_ja.h" diff --git a/ext/mbstring/libmbfl/nls/nls_kr.c b/ext/mbstring/libmbfl/nls/nls_kr.c index afff43a..3b1a7ad 100644 --- a/ext/mbstring/libmbfl/nls/nls_kr.c +++ b/ext/mbstring/libmbfl/nls/nls_kr.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_kr.h" diff --git a/ext/mbstring/libmbfl/nls/nls_neutral.c b/ext/mbstring/libmbfl/nls/nls_neutral.c index 87a6a19..8abd3e9 100644 --- a/ext/mbstring/libmbfl/nls/nls_neutral.c +++ b/ext/mbstring/libmbfl/nls/nls_neutral.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_neutral.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ru.c b/ext/mbstring/libmbfl/nls/nls_ru.c index 7e4cf9c..c452630 100644 --- a/ext/mbstring/libmbfl/nls/nls_ru.c +++ b/ext/mbstring/libmbfl/nls/nls_ru.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_ru.h" diff --git a/ext/mbstring/libmbfl/nls/nls_tr.c b/ext/mbstring/libmbfl/nls/nls_tr.c index c7044ff..1d17bd2 100644 --- a/ext/mbstring/libmbfl/nls/nls_tr.c +++ b/ext/mbstring/libmbfl/nls/nls_tr.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_tr.h" diff --git a/ext/mbstring/libmbfl/nls/nls_ua.c b/ext/mbstring/libmbfl/nls/nls_ua.c index 85fe9b4..8f75b34 100644 --- a/ext/mbstring/libmbfl/nls/nls_ua.c +++ b/ext/mbstring/libmbfl/nls/nls_ua.c @@ -2,11 +2,7 @@ #include "config.h" #endif - -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif - #include "mbfilter.h" #include "nls_ua.h" diff --git a/ext/mbstring/libmbfl/nls/nls_uni.c b/ext/mbstring/libmbfl/nls/nls_uni.c index 6a01001..d4fb42c 100644 --- a/ext/mbstring/libmbfl/nls/nls_uni.c +++ b/ext/mbstring/libmbfl/nls/nls_uni.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_uni.h" diff --git a/ext/mbstring/libmbfl/nls/nls_zh.c b/ext/mbstring/libmbfl/nls/nls_zh.c index d9a4993..2de9015 100644 --- a/ext/mbstring/libmbfl/nls/nls_zh.c +++ b/ext/mbstring/libmbfl/nls/nls_zh.c @@ -2,9 +2,7 @@ #include "config.h" #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #include "mbfilter.h" #include "nls_zh.h" diff --git a/main/php_network.h b/main/php_network.h index 4d6b18f..296be2b 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -89,9 +89,7 @@ END_EXTERN_C() #include <sys/time.h> #endif -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif #ifdef PHP_WIN32 typedef SOCKET php_socket_t;