From 5f8915786f9fc3ec1af1089c9848f65a8d1541f5 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 7 Apr 2019 15:55:34 +0200 Subject: Remove HAVE_SIGNAL_H The `` header file is part of the standard C89 headers [1] and on current systems can be included unconditionally. Since file requires at least C89 or greater, the `HAVE_SIGNAL_H` symbol defined by Autoconf in Zend.m4 [2] can be ommitted and simplifed. The bundled libmagic (file) also ommits the usage of HAVE_SIGNAL_H since 5.35 however current version in PHP is very modified 5.34 version and will be refactored separately. Check for HAVE_SIGNAL_H is therefore still done in the configure.ac. 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 --- sapi/cli/php_cli.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sapi/cli/php_cli.c') diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 4333487a0b..364fd13106 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -46,9 +46,9 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_SIGNAL_H + #include -#endif + #if HAVE_SETLOCALE #include #endif @@ -66,10 +66,6 @@ #include "win32/php_registry.h" #endif -#if HAVE_SIGNAL_H -#include -#endif - #ifdef __riscos__ #include #endif @@ -1233,7 +1229,6 @@ int main(int argc, char *argv[]) } #endif -#ifdef HAVE_SIGNAL_H #if defined(SIGPIPE) && defined(SIG_IGN) signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so that sockets created via fsockopen() @@ -1242,8 +1237,6 @@ int main(int argc, char *argv[]) does that for us! thies@thieso.net 20000419 */ #endif -#endif - #ifdef ZTS php_tsrm_startup(); -- cgit v1.2.1