diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 17:40:27 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 17:40:27 +0100 |
| commit | ec533514473d480b2619ee0f81e49f8a7683bdf2 (patch) | |
| tree | 0b359cd91f3c5a8a2f8280686558f404b2dc2075 /sapi/phpdbg/phpdbg_bp.h | |
| parent | efe9cc3a86a769f1ac3d16f4b12f5e83053c6822 (diff) | |
| parent | 297baa0c18d8d04de7a683a51b9f069c84a855f3 (diff) | |
| download | php-git-ec533514473d480b2619ee0f81e49f8a7683bdf2.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
configure.in
main/php_version.h
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_prompt.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_bp.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.h b/sapi/phpdbg/phpdbg_bp.h index 83c8bbcada..99c4eb6011 100644 --- a/sapi/phpdbg/phpdbg_bp.h +++ b/sapi/phpdbg/phpdbg_bp.h @@ -157,6 +157,7 @@ PHPDBG_API phpdbg_breakbase_t *phpdbg_find_breakbase(zend_ulong id TSRMLS_DC); PHPDBG_API phpdbg_breakbase_t *phpdbg_find_breakbase_ex(zend_ulong id, HashTable **table, zend_ulong *numkey, zend_string **strkey TSRMLS_DC); /* }}} */ /* {{{ Breakpoint Exportation API */ -PHPDBG_API void phpdbg_export_breakpoints(FILE *handle TSRMLS_DC); /* }}} */ +PHPDBG_API void phpdbg_export_breakpoints(FILE *handle TSRMLS_DC); +PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str TSRMLS_DC); /* }}} */ #endif /* PHPDBG_BP_H */ |