diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 14:32:58 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 14:32:58 +0100 |
| commit | baba4254ce481b779beab6dd75cbe6a9612b3243 (patch) | |
| tree | be0149046d56299d5c81a4c6b22d43ca59fd47fb /sapi/phpdbg/phpdbg_bp.h | |
| parent | a3ae40152490eacdced73408b9978c8ba31d0179 (diff) | |
| parent | 0ede82d4665fb0c03ef6cf43bdf05e14f475b230 (diff) | |
| download | php-git-baba4254ce481b779beab6dd75cbe6a9612b3243.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg_bp.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_bp.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.h b/sapi/phpdbg/phpdbg_bp.h index a8d2316a3f..83c8bbcada 100644 --- a/sapi/phpdbg/phpdbg_bp.h +++ b/sapi/phpdbg/phpdbg_bp.h @@ -121,6 +121,7 @@ typedef struct _phpdbg_breakcond_t { PHPDBG_API void phpdbg_resolve_op_array_breaks(zend_op_array *op_array TSRMLS_DC); PHPDBG_API int phpdbg_resolve_op_array_break(phpdbg_breakopline_t *brake, zend_op_array *op_array TSRMLS_DC); PHPDBG_API int phpdbg_resolve_opline_break(phpdbg_breakopline_t *new_break TSRMLS_DC); +PHPDBG_API HashTable *phpdbg_resolve_pending_file_break_ex(const char *file, uint filelen, zend_string *cur, HashTable *fileht TSRMLS_DC); PHPDBG_API void phpdbg_resolve_pending_file_break(const char *file TSRMLS_DC); /* }}} */ /* {{{ Breakpoint Creation API */ |