Fixed TSRM build

diff --git a/phpdbg_watch.c b/phpdbg_watch.c
index acbbffdb6919647850c70f8d1de4d091df828af3..6b1a42ddbe3d85407add1e0e83222b29a0410558 100644 (file)
--- a/phpdbg_watch.c
+++ b/phpdbg_watch.c
@@ -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);

diff --git a/phpdbg_watch.h b/phpdbg_watch.h
index a5dac0effabf05e376970a8199a269204a6f8dec..56dd068e2faa8ee33d8a441f09d79f7e19317f20 100644 (file)
--- a/phpdbg_watch.h
+++ b/phpdbg_watch.h
@@ -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));