Browse Source

Remove HAVE_STDDEF_H

The `<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
pull/3408/head
Peter Kokot 7 years ago
committed by Joe Watkins
parent
commit
6c1ff61a36
No known key found for this signature in database GPG Key ID: F9BA0ADA31CBD89E
  1. 3
      ext/mbstring/libmbfl/config.h.in
  2. 1
      ext/mbstring/libmbfl/config.h.w32
  3. 4
      ext/mbstring/libmbfl/mbfl/mbfilter.c
  4. 2
      ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c
  5. 2
      ext/mbstring/libmbfl/mbfl/mbfilter_pass.c
  6. 2
      ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c
  7. 2
      ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
  8. 2
      ext/mbstring/libmbfl/mbfl/mbfl_convert.c
  9. 2
      ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
  10. 2
      ext/mbstring/libmbfl/mbfl/mbfl_ident.c
  11. 6
      ext/mbstring/libmbfl/mbfl/mbfl_language.c
  12. 2
      ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c
  13. 2
      ext/mbstring/libmbfl/mbfl/mbfl_string.c
  14. 2
      ext/mbstring/libmbfl/nls/nls_de.c
  15. 2
      ext/mbstring/libmbfl/nls/nls_en.c
  16. 2
      ext/mbstring/libmbfl/nls/nls_hy.c
  17. 2
      ext/mbstring/libmbfl/nls/nls_ja.c
  18. 2
      ext/mbstring/libmbfl/nls/nls_kr.c
  19. 2
      ext/mbstring/libmbfl/nls/nls_neutral.c
  20. 2
      ext/mbstring/libmbfl/nls/nls_ru.c
  21. 2
      ext/mbstring/libmbfl/nls/nls_tr.c
  22. 4
      ext/mbstring/libmbfl/nls/nls_ua.c
  23. 2
      ext/mbstring/libmbfl/nls/nls_uni.c
  24. 2
      ext/mbstring/libmbfl/nls/nls_zh.c
  25. 2
      main/php_network.h

3
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

1
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 */

4
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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>

2
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"

6
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>

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

4
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"

2
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"

2
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"

2
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;

Loading…
Cancel
Save