summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-09-16 01:14:08 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-09-18 05:32:08 +0200
commitd3ca28f5694e7848fb2b238bbe3e9564230ae65e (patch)
tree60bef3e2097c17b370ddc8eaee424416bbd39399 /main
parentcfe46a5d7970e988591f0593ae3ebddf9e5196f4 (diff)
downloadphp-git-d3ca28f5694e7848fb2b238bbe3e9564230ae65e.tar.gz
Remove HAVE_STRING_H
The C89 standard and later defines the `<string.h>` header as part of the standard headers [1] and on current systems it is always present. Code included also `<strings.h>` header as an alterinative in some files. This kind of check was relevant on some older systems where the `<strings.h>` file included definitions for the C89 compliant `<string.h>`. Today such alternative check is not required anymore. The `<strings.h>` 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 `<strings.h>` 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
Diffstat (limited to 'main')
-rw-r--r--main/alloca.c3
-rw-r--r--main/php_scandir.c2
2 files changed, 0 insertions, 5 deletions
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 <string.h>
-#endif
-
#include <stdlib.h>
#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 <string.h>
-#endif
PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b)
{