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

Fixed TSRM build

Browse Source
This commit is contained in:
Bob Weinand 2014-03-23 14:57:25 +01:00
parent bd2305f1d2
commit 30fab784dc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpdbg_watch.c
View File

@ -436,13 +436,15 @@ PHPDBG_WATCH(array) /* {{{ */
} /* }}} */
void phpdbg_watch_HashTable_dtor(zval **zv) {
TSRMLS_FETCH();
phpdbg_btree_result *result;
if ((result = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong)*zv))) {
phpdbg_watchpoint_t *watch = result->ptr;
PHPDBG_G(watchpoint_hit) = 1;
phpdbg_notice("%.*s was removed, removing watchpoint%s", watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_RECURSIVE)?" recursively":"");
phpdbg_notice("%.*s was removed, removing watchpoint%s", (int)watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_RECURSIVE)?" recursively":"");
if (watch->flags & PHPDBG_WATCH_RECURSIVE) {
phpdbg_delete_watchpoint_recursive(watch TSRMLS_CC);

2
phpdbg_watch.h
View File

@ -98,7 +98,7 @@ void phpdbg_list_watchpoints(TSRMLS_D);
void phpdbg_watch_efree(void *ptr);
long phpdbg_pagesize;
static long phpdbg_pagesize;
static zend_always_inline void *phpdbg_get_page_boundary(void *addr) {
return (void *)((size_t)addr & ~(phpdbg_pagesize - 1));