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_server.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sapi/cli/php_cli_server.c') diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index deb61816a7..c814b73f26 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -43,9 +43,7 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_SIGNAL_H #include -#endif #if HAVE_SETLOCALE #include #endif @@ -2601,7 +2599,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */ PHP_VERSION, buf, server_bind_address, document_root); } -#if defined(HAVE_SIGNAL_H) && defined(SIGINT) +#if defined(SIGINT) signal(SIGINT, php_cli_server_sigint_handler); zend_signal_init(); #endif -- cgit v1.2.1