Remove unnecessary #include <signal.h>

alexdowad · alexdowad · commit ce166b2738f8 · 2020-05-19T19:26:39.000+02:00
zend.h includes zend_signal.h, which includes signal.h. So we don't need to repeat
this #include so many times.
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
@@ -67,8 +67,6 @@ typedef int ts_rsrc_id;
 # define MUTEX_T pthread_mutex_t *
 #endif
 
-#include <signal.h>
-
 typedef void (*ts_allocate_ctor)(void *);
 typedef void (*ts_allocate_dtor)(void *);
 
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -57,7 +57,6 @@
 #include "zend_operators.h"
 #include "zend_multiply.h"
 #include "zend_bitset.h"
-#include <signal.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -21,7 +21,6 @@
 #define ZEND_INTENSIVE_DEBUGGING 0
 
 #include <stdio.h>
-#include <signal.h>
 
 #include "zend.h"
 #include "zend_compile.h"
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -19,7 +19,6 @@
 */
 
 #include <stdio.h>
-#include <signal.h>
 
 #include "zend.h"
 #include "zend_compile.h"
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -49,7 +49,6 @@
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <signal.h>
 
 #ifdef PHP_WIN32
 #include <winsock2.h>
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "php_mysqli_structs.h"
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#include <signal.h>
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -73,7 +73,6 @@ typedef int gid_t;
 # include <unistd.h>
 #endif
 #include <fcntl.h>
-#include <signal.h>
 #include <time.h>
 
 #ifndef ZEND_WIN32
diff --git a/ext/opcache/shared_alloc_shm.c b/ext/opcache/shared_alloc_shm.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/ext/pcntl/php_signal.h b/ext/pcntl/php_signal.h
@@ -14,10 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include <signal.h>
 #ifndef PHP_SIGNAL_H
 #define PHP_SIGNAL_H
 
+#include <signal.h>
+
 #ifdef HAVE_STRUCT_SIGINFO_T
 typedef void Sigfunc(int, siginfo_t*, void*);
 #else
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
@@ -35,7 +35,6 @@
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>
 #include <sys/times.h>
 #include <errno.h>
 #include <grp.h>
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
@@ -30,8 +30,6 @@
 #include <sys/wait.h>
 #endif
 
-#include <signal.h>
-
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -32,10 +32,6 @@
 #include <sys/sysexits.h>
 #endif
 
-#if PHP_SIGCHILD
-#include <signal.h>
-#endif
-
 #include "php_syslog.h"
 #include "php_mail.h"
 #include "php_ini.h"
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
@@ -17,7 +17,6 @@
 #include "php.h"
 #include <stdio.h>
 #include <ctype.h>
-#include <signal.h>
 #include "php_string.h"
 #include "ext/standard/head.h"
 #include "ext/standard/basic_functions.h"
diff --git a/main/main.c b/main/main.c
@@ -38,7 +38,6 @@
 #include <unistd.h>
 #endif
 
-#include <signal.h>
 #include <locale.h>
 #include "zend.h"
 #include "zend_types.h"
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -43,8 +43,6 @@
 # include <unistd.h>
 #endif
 
-#include <signal.h>
-
 #include <locale.h>
 
 #if HAVE_SYS_TYPES_H
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -42,7 +42,6 @@
 #include <unistd.h>
 #endif
 
-#include <signal.h>
 #include <locale.h>
 
 #if HAVE_DLFCN_H
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -41,8 +41,6 @@
 # include <unistd.h>
 #endif
 
-#include <signal.h>
-
 #include <locale.h>
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
@@ -42,7 +42,6 @@
 
 #endif
 
-#include <signal.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
@@ -54,7 +54,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <limits.h>
 #include <sys/stat.h>
 #include <sched.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c
@@ -80,7 +80,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <stdarg.h>
 
-#include <signal.h>
 #include <time.h>
 #include <sys/timeb.h>
 #include <unistd.h>
