archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Remove HAVE_SIGNAL_H
This commit is contained in:
Peter Kokot 2019-04-07 15:57:21 +02:00
commit e4a563b0c0
16 changed files with 11 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sapi/cli/php_cli.c
View file

@ -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();