com php-src: Fix bug #111 (compile error without ZEND_SIGNALS ): sapi/phpdbg/phpdbg.c

Commit: 2f57d19f764b2680c29d5d00a771e674af0e4e88 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 14 Sep 2014 12:24:56 +0200 Committer: Julien Pauli <jpauli@php.net> Mon, 15 Sep 2014 15:12:54 +0200 Parents: 78e8b1511c577e85d2160eeaf7f2d6e8f1d6503b Branches: PHP-5.6.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2f57d19f764b2680c29d5d00a771e674af0e4e88 Log: Fix bug #111 (compile error without ZEND_SIGNALS) Bugs: https://bugs.php.net/111 Changed paths: M sapi/phpdbg/phpdbg.c Diff: diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 1fbd18a..c881559 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/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