diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 6 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 11 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 4 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 6 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 7 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 2 |
7 files changed, 6 insertions, 32 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index b22d37f89b..8a461d8c44 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -45,9 +45,7 @@ # include <unistd.h> #endif -#if HAVE_SIGNAL_H -# include <signal.h> -#endif +#include <signal.h> #if HAVE_SETLOCALE # include <locale.h> @@ -1779,7 +1777,6 @@ int main(int argc, char *argv[]) char *decoded_query_string; int skip_getopt = 0; -#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() @@ -1788,7 +1785,6 @@ int main(int argc, char *argv[]) does that for us! thies@thieso.net 20000419 */ #endif -#endif #ifdef ZTS php_tsrm_startup(); 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 <unistd.h> #endif -#if HAVE_SIGNAL_H + #include <signal.h> -#endif + #if HAVE_SETLOCALE #include <locale.h> #endif @@ -66,10 +66,6 @@ #include "win32/php_registry.h" #endif -#if HAVE_SIGNAL_H -#include <signal.h> -#endif - #ifdef __riscos__ #include <unixlib/local.h> #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(); 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 <unistd.h> #endif -#if HAVE_SIGNAL_H #include <signal.h> -#endif #if HAVE_SETLOCALE #include <locale.h> #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 diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 4fcb181cc0..d651f6b491 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -159,7 +159,6 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv) { zend_llist global_vars; -#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() @@ -168,7 +167,6 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv) does that for us! thies@thieso.net 20000419 */ #endif -#endif #ifdef ZTS php_tsrm_startup(); diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 307c02ed7c..3c637d5990 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -43,9 +43,7 @@ # include <unistd.h> #endif -#if HAVE_SIGNAL_H -# include <signal.h> -#endif +#include <signal.h> #if HAVE_SETLOCALE # include <locale.h> @@ -1567,7 +1565,6 @@ int main(int argc, char *argv[]) zend_bool old_rc_debug; #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() @@ -1576,7 +1573,6 @@ int main(int argc, char *argv[]) does that for us! thies@thieso.net 20000419 */ #endif -#endif #ifdef ZTS php_tsrm_startup(); diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 2d8eb75326..4a6b1a0f3f 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -43,12 +43,7 @@ #endif -#if HAVE_SIGNAL_H - #include <signal.h> - -#endif - #include <sys/socket.h> #include <arpa/inet.h> #include <netinet/in.h> @@ -1228,11 +1223,9 @@ int main( int argc, char * argv[] ) int slow_script_msec = 0; char time_buf[40]; -#ifdef HAVE_SIGNAL_H #if defined(SIGPIPE) && defined(SIG_IGN) signal(SIGPIPE, SIG_IGN); #endif -#endif #ifdef ZTS php_tsrm_startup(); diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index c2298037d4..d1b22e6f40 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -46,7 +46,7 @@ #include "zend_ini_scanner.h" #include "zend_stream.h" #include "zend_signal.h" -#if !defined(_WIN32) && !defined(ZEND_SIGNALS) && defined(HAVE_SIGNAL_H) +#if !defined(_WIN32) && !defined(ZEND_SIGNALS) # include <signal.h> #elif defined(PHP_WIN32) # include "win32/signal.h" |