com php-src: Fixed TSRM build: phpdbg_watch.c phpdbg_wa tch.h
| From: | Bob Weinand | Date: | Sun, 23 Mar 2014 13:57:25 +0000 |
| Subject: | com php-src: Fixed TSRM build: phpdbg_watch.c phpdbg_wa tch.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77019@lists.php.net to get a copy of this message | ||
Commit: 30fab784dc161de509674eb45640cf13f5d7d094
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 23 Mar 2014 14:57:25 +0100
Parents: bd2305f1d2b69eb05c0929ab9cf2189e5e9bc67e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30fab784dc161de509674eb45640cf13f5d7d094
Log:
Fixed TSRM build
Changed paths:
M phpdbg_watch.c
M phpdbg_watch.h
Diff:
diff --git a/phpdbg_watch.c b/phpdbg_watch.c
index acbbffd..6b1a42d 100644
--- 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 a5dac0e..56dd068 100644
--- 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));