com php-src: Fix bug #111 (compile error without ZEND_SIGNALS ): phpdbg.c
| From: | Bob Weinand | Date: | Sun, 14 Sep 2014 10:24:56 +0000 |
| Subject: | com php-src: Fix bug #111 (compile error without ZEND_SIGNALS ): phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81618@lists.php.net to get a copy of this message | ||
Commit: 05c73757eda452bcc43de4f5e2d80ec300e0595d
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 14 Sep 2014 12:24:56 +0200
Parents: 6464b3ffaeadf2243de864dc28f84ce196b27a55
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=05c73757eda452bcc43de4f5e2d80ec300e0595d
Log:
Fix bug #111 (compile error without ZEND_SIGNALS)
Bugs:
https://bugs.php.net/111
Changed paths:
M phpdbg.c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index 1fbd18a..c881559 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -1296,14 +1296,14 @@ phpdbg_main:
/* do not install sigint handlers for remote consoles */
/* sending SIGINT then provides a decent way of shutting down the server */
-#if defined(ZEND_SIGNALS) && !defined(_WIN32)
- if (listen[0] < 0) {
- zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try();
- }
-#elif !defined(_WIN32)
+#ifndef _WIN32
if (listen[0] < 0) {
#endif
+#if defined(ZEND_SIGNALS) && !defined(_WIN32)
+ zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try();
+#else
signal(SIGINT, phpdbg_sigint_handler);
+#endif
#ifndef _WIN32
}
#endif