archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix conflict

Browse source
This commit is contained in:
Felipe Pena 2013-11-10 15:51:20 -02:00
commit 22f0ff6c12
4 changed files with 114 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
phpdbg.h
View file

@ -18,6 +18,7 @@
#include "php.h"
#include "php_globals.h"
#include "php_variables.h"
#include "php_getopt.h"
#include "zend_modules.h"
#include "zend_ini_scanner.h"
#include "zend_globals.h"
@ -46,10 +47,11 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
size_t exec_len; /* size of exec */
zend_op_array *ops; /* op_array */
zval *retval; /* return value */
zend_bool stepping; /* stepping */
int stepping; /* stepping */
int vmret; /* return from last opcode handler execution */
zend_bool has_file_bp; /* file-based breakpoint has been set */
zend_bool has_sym_bp; /* symbol-based breakpoint has been set */
zend_bool quitting; /* quitting flag */
ZEND_END_MODULE_GLOBALS(phpdbg)
#include "phpdbg_prompt.h"