From: Peter Kokot Date: Sat, 15 Sep 2018 23:14:08 +0000 (+0200) Subject: Remove HAVE_STRING_H X-Git-Tag: php-7.4.0alpha1~1883 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3ca28f5694e7848fb2b238bbe3e9564230ae65e;p=php Remove HAVE_STRING_H The C89 standard and later defines the `` header as part of the standard headers [1] and on current systems it is always present. Code included also `` header as an alterinative in some files. This kind of check was relevant on some older systems where the `` file included definitions for the C89 compliant ``. Today such alternative check is not required anymore. The `` file is part of the POSIX definition these days. Also Autoconf suggests doing this and relying on C89 or above [2] and [3]. This patch also cleans few unused `` inclusions in the libmbfl. [1]: https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2 [2]: http://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4 [3]: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html --- diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 8b7971eea1..55a98d6ff3 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -50,7 +50,6 @@ inttypes.h \ stdint.h \ limits.h \ malloc.h \ -string.h \ unistd.h \ stdarg.h \ sys/types.h \ diff --git a/Zend/configure.ac b/Zend/configure.ac index 5b88ff0ead..8252cfb342 100644 --- a/Zend/configure.ac +++ b/Zend/configure.ac @@ -42,11 +42,7 @@ AH_BOTTOM([ # include #endif -#ifdef HAVE_STRING_H -# include -#else -# include -#endif +#include #if ZEND_BROKEN_SPRINTF int zend_sprintf(char *buffer, const char *format, ...); diff --git a/configure.ac b/configure.ac index a07ee1399b..b5d413a5b9 100644 --- a/configure.ac +++ b/configure.ac @@ -51,11 +51,7 @@ AH_BOTTOM([ # include #endif -#ifdef HAVE_STRING_H -# include -#else -# include -#endif +#include #if ZEND_BROKEN_SPRINTF int zend_sprintf(char *buffer, const char *format, ...); @@ -447,7 +443,6 @@ pwd.h \ resolv.h \ signal.h \ stdarg.h \ -string.h \ syslog.h \ sysexits.h \ sys/ioctl.h \ diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 66b40b9ca4..2b4e04c01d 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -94,7 +94,7 @@ int main() { return foo(10, "", 3.14); } ]) ]) - AC_CHECK_HEADERS([string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h limits.h]) + AC_CHECK_HEADERS([strings.h unistd.h sys/time.h sys/times.h stdarg.h limits.h]) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(long, 4) diff --git a/ext/mbstring/libmbfl/config.h.in b/ext/mbstring/libmbfl/config.h.in index 9adcff3fba..8d3cd739c0 100644 --- a/ext/mbstring/libmbfl/config.h.in +++ b/ext/mbstring/libmbfl/config.h.in @@ -29,9 +29,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H diff --git a/ext/mbstring/libmbfl/config.h.w32 b/ext/mbstring/libmbfl/config.h.w32 index d32cafd2d0..72d7ef5514 100644 --- a/ext/mbstring/libmbfl/config.h.w32 +++ b/ext/mbstring/libmbfl/config.h.w32 @@ -1,6 +1,5 @@ #define HAVE_MEMORY_H 1 /* #undef HAVE_STRINGS_H */ -#define HAVE_STRING_H 1 /* #undef HAVE_STRCASECMP */ #define HAVE_STRICMP 1 #define HAVE_WIN32_NATIVE_THREAD 1 diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index 12ff178b61..4213cadb7a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -31,14 +31,7 @@ #include "config.h" #endif -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif - #include "mbfilter.h" #include "mbfilter_htmlent.h" #include "html_entities.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 56f03b6355..6821063136 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -85,14 +85,7 @@ #endif #include - -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif #include "mbfilter.h" #include "mbfl_filter_output.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index c8bd0486e0..86636f69c5 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -38,14 +38,7 @@ #include #endif -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif - #include #include "mbfl_allocators.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index a1367230d8..d804961701 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -33,10 +33,7 @@ #endif #include - -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_STRINGS_H #include diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index ca0307983f..0d5e6a2471 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -33,10 +33,7 @@ #endif #include - -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_STRINGS_H #include diff --git a/ext/standard/array.c b/ext/standard/array.c index fb3120f445..b44472366f 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -28,11 +28,7 @@ #include #include #include -#if HAVE_STRING_H #include -#else -#include -#endif #ifdef PHP_WIN32 #include "win32/unistd.h" #endif diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 160e510831..f60c09b5e4 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -75,11 +75,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; # include #endif -#if HAVE_STRING_H -# include -#else -# include -#endif +#include #if HAVE_LOCALE_H # include diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index cc9597a28e..38dd089e4e 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -38,11 +38,7 @@ # endif #endif #include -#if HAVE_STRING_H #include -#else -#include -#endif #ifdef PHP_WIN32 #include diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c index 7b45f73019..749b45ae47 100644 --- a/ext/standard/crypt_sha256.c +++ b/ext/standard/crypt_sha256.c @@ -26,11 +26,7 @@ #else # include # include -# if HAVE_STRING_H -# include -# else -# include -# endif +# include #endif char * __php_stpncpy(char *dst, const char *src, size_t len) diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c index f71c69e5ec..0ef2a62afb 100644 --- a/ext/standard/crypt_sha512.c +++ b/ext/standard/crypt_sha512.c @@ -25,11 +25,7 @@ #else # include # include -# if HAVE_STRING_H -# include -# else -# include -# endif +# include #endif extern void * __php_mempcpy(void * dst, const void * src, size_t len); diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 5ac18f126f..ec98b0bcc0 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -29,11 +29,7 @@ #if defined(HAVE_LIBDL) #include #include -#ifdef HAVE_STRING_H #include -#else -#include -#endif #ifdef PHP_WIN32 #include "win32/param.h" #include "win32/winutil.h" diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4 index d841d08c2d..b1d99bc316 100644 --- a/ext/xmlrpc/libxmlrpc/acinclude.m4 +++ b/ext/xmlrpc/libxmlrpc/acinclude.m4 @@ -12,7 +12,7 @@ AC_CHECK_FUNCS( \ AC_DEFUN([XMLRPC_HEADER_CHECKS],[ AC_HEADER_STDC -AC_CHECK_HEADERS(xmlparse.h xmltok.h strings.h string.h) +AC_CHECK_HEADERS(xmlparse.h xmltok.h strings.h) ]) AC_DEFUN([XMLRPC_TYPE_CHECKS],[ diff --git a/main/alloca.c b/main/alloca.c index d136bbd177..07d1f01af9 100644 --- a/main/alloca.c +++ b/main/alloca.c @@ -25,10 +25,7 @@ #if !HAVE_ALLOCA -#ifdef HAVE_STRING_H #include -#endif - #include #ifdef emacs diff --git a/main/php_scandir.c b/main/php_scandir.c index 76628528a4..3c48c754da 100644 --- a/main/php_scandir.c +++ b/main/php_scandir.c @@ -42,9 +42,7 @@ #ifndef HAVE_ALPHASORT -#ifdef HAVE_STRING_H #include -#endif PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b) { diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 2173d84cdb..cfb3f43fa3 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -98,7 +98,6 @@ #define HAVE_FCNTL_H 1 #define HAVE_GRP_H 0 #undef HAVE_PWD_H -#define HAVE_STRING_H 1 #undef HAVE_SYS_FILE_H #undef HAVE_SYS_SOCKET_H #undef HAVE_SYS_WAIT_H