com php-src: Fix non-debug build: sapi/phpdbg/phpdbg.c

Commit: f1698eedce1c6534c9678d45a12f720c40e4bc1d Author: Bob Weinand <bobwei9@hotmail.com> Fri, 24 Jul 2015 17:51:46 +0200 Parents: 76b882f0fc0c900561743644c3056ec2c83852e8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1698eedce1c6534c9678d45a12f720c40e4bc1d Log: Fix non-debug build Changed paths: M sapi/phpdbg/phpdbg.c Diff: diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 12a2c94..7ea2ea8 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1226,7 +1226,7 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */ /* A bit dark magic in order to have meaningful allocator adresses */ -#if ZEND_DEBUG && __has_builtin(__builtin_frame_address) +#if ZEND_DEBUG && (__has_builtin(__builtin_frame_address) || ZEND_GCC_VERSION >= 3004) #define FETCH_PARENT_FILELINE(argsize) \ char *__zend_filename, *__zend_orig_filename; \ uint __zend_lineno, __zend_orig_lineno; \ @@ -1245,9 +1245,11 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */ parent -= sizeof(uint); /* orig_lineno */ \ __zend_orig_lineno = *(uint *) parent; #elif ZEND_DEBUG -#define FETCH_PARENT_FILELINE() \ +#define FETCH_PARENT_FILELINE(argsize) \ char *__zend_filename = __FILE__, *__zend_orig_filename = NULL; \ uint __zend_lineno = __LINE__, __zend_orig_lineno = 0; +#else +#define FETCH_PARENT_FILELINE(argsize) #endif void *phpdbg_malloc_wrapper(size_t size) /* {{{ */ @@ -1698,20 +1700,13 @@ phpdbg_main: #endif #ifndef _WIN32 } -#endif - -// PG(modules_activated) = 0; -#ifndef _WIN32 /* setup io here */ if (remote) { PHPDBG_G(flags) |= PHPDBG_IS_REMOTE; signal(SIGPIPE, SIG_IGN); } -#endif - -#ifndef _WIN32 PHPDBG_G(io)[PHPDBG_STDIN].ptr = stdin; PHPDBG_G(io)[PHPDBG_STDIN].fd = fileno(stdin); PHPDBG_G(io)[PHPDBG_STDOUT].ptr = stdout;