From 02ae3f8de1799d5ae4a6fa2cc86a34acb4767e9c Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 25 Nov 2013 23:45:55 +0100 Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg --- phpdbg.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'phpdbg.h') diff --git a/phpdbg.h b/phpdbg.h index 19cf0c463a..6962cdbf4b 100644 --- a/phpdbg.h +++ b/phpdbg.h @@ -112,11 +112,12 @@ #define PHPDBG_IS_INITIALIZING (1<<19) #define PHPDBG_IS_SIGNALED (1<<20) #define PHPDBG_IS_INTERACTIVE (1<<21) +#define PHPDBG_IS_BP_ENABLED (1<<22) #ifndef _WIN32 -# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_COLOURED) +# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_COLOURED|PHPDBG_IS_BP_ENABLED) #else -# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET) +# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_BP_ENABLED) #endif /* }}} */ /* {{{ strings */ @@ -137,7 +138,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) HashTable registered; /* registered */ HashTable seek; /* seek oplines */ phpdbg_frame_t frame; /* frame */ - + char *exec; /* file to execute */ size_t exec_len; /* size of exec */ zend_op_array *ops; /* op_array */ @@ -151,10 +152,10 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) char *prompt[2]; /* prompt */ const phpdbg_color_t *colors[PHPDBG_COLORS]; /* colors */ - + phpdbg_command_t *lcmd; /* last command */ phpdbg_param_t lparam; /* last param */ - + zend_ulong flags; /* phpdbg flags */ ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */ -- cgit v1.2.1