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

Fix non-debug build

Browse source
This commit is contained in:
Bob Weinand 2015-07-24 17:51:46 +02:00
parent 76b882f0fc
commit f1698eedce
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sapi/phpdbg/phpdbg.c
View file

@ -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 */ /* 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) \ #define FETCH_PARENT_FILELINE(argsize) \
char *__zend_filename, *__zend_orig_filename; \ char *__zend_filename, *__zend_orig_filename; \
uint __zend_lineno, __zend_orig_lineno; \ 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 */ \ parent -= sizeof(uint); /* orig_lineno */ \
__zend_orig_lineno = *(uint *) parent; __zend_orig_lineno = *(uint *) parent;
#elif ZEND_DEBUG #elif ZEND_DEBUG
#define FETCH_PARENT_FILELINE() \ #define FETCH_PARENT_FILELINE(argsize) \
char *__zend_filename = __FILE__, *__zend_orig_filename = NULL; \ char *__zend_filename = __FILE__, *__zend_orig_filename = NULL; \
uint __zend_lineno = __LINE__, __zend_orig_lineno = 0; uint __zend_lineno = __LINE__, __zend_orig_lineno = 0;
#else
#define FETCH_PARENT_FILELINE(argsize)
#endif #endif
void *phpdbg_malloc_wrapper(size_t size) /* {{{ */ void *phpdbg_malloc_wrapper(size_t size) /* {{{ */
@ -1698,20 +1700,13 @@ phpdbg_main:
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
} }
#endif
// PG(modules_activated) = 0;
#ifndef _WIN32
/* setup io here */ /* setup io here */
if (remote) { if (remote) {
PHPDBG_G(flags) |= PHPDBG_IS_REMOTE; PHPDBG_G(flags) |= PHPDBG_IS_REMOTE;
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
} }
#endif
#ifndef _WIN32
PHPDBG_G(io)[PHPDBG_STDIN].ptr = stdin; PHPDBG_G(io)[PHPDBG_STDIN].ptr = stdin;
PHPDBG_G(io)[PHPDBG_STDIN].fd = fileno(stdin); PHPDBG_G(io)[PHPDBG_STDIN].fd = fileno(stdin);
PHPDBG_G(io)[PHPDBG_STDOUT].ptr = stdout; PHPDBG_G(io)[PHPDBG_STDOUT].ptr = stdout;