clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

Browse Source 
* phpdbg/master:
  C89 compat
This commit is contained in:
Anatol Belski 2014-04-27 18:01:26 +02:00
commit 3b6bf6eec8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sapi/phpdbg/phpdbg_watch.c
View File

@ -464,9 +464,9 @@ PHPDBG_WATCH(array) /* {{{ */
void phpdbg_watch_HashTable_dtor(zval **zv) {
phpdbg_btree_result *result;
zval_ptr_dtor_wrapper(zv);
TSRMLS_FETCH();
zval_ptr_dtor_wrapper(zv);
if ((result = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong)*zv))) {
phpdbg_watchpoint_t *watch = result->ptr;
@ -772,9 +772,11 @@ void phpdbg_list_watchpoints(TSRMLS_D) {
}
void phpdbg_watch_efree(void *ptr) {
phpdbg_btree_result *result = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), (zend_ulong)ptr);
phpdbg_btree_result *result;
TSRMLS_FETCH();
result = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), (zend_ulong)ptr);
if (result) {
phpdbg_watchpoint_t *watch = result->ptr;