More TSRMLS_FETCH annihilation

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index db418ac18615398ed7f75bae8e461e3804af632c..6f868715da02deccdd987f5c2d65f6fc7acf9da1 100644 (file)
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -163,6 +163,7 @@ void list_entry_destructor(void *ptr)
 {
        zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
        zend_rsrc_list_dtors_entry *ld;
+       TSRMLS_FETCH();
        
        if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
                switch (ld->type) {
@@ -173,7 +174,7 @@ void list_entry_destructor(void *ptr)
                                break;
                        case ZEND_RESOURCE_LIST_TYPE_EX:
                                if (ld->list_dtor_ex) {
-                                       ld->list_dtor_ex(le);
+                                       ld->list_dtor_ex(le TSRMLS_CC);
                                }
                                break;
                        EMPTY_SWITCH_DEFAULT_CASE()
@@ -188,6 +189,7 @@ void plist_entry_destructor(void *ptr)
 {
        zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
        zend_rsrc_list_dtors_entry *ld;
+       TSRMLS_FETCH();
 
        if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
                switch (ld->type) {
@@ -198,7 +200,7 @@ void plist_entry_destructor(void *ptr)
                                break;
                        case ZEND_RESOURCE_LIST_TYPE_EX:
                                if (ld->plist_dtor_ex) {
-                                       ld->plist_dtor_ex(le);
+                                       ld->plist_dtor_ex(le TSRMLS_CC);
                                }
                                break;
                                EMPTY_SWITCH_DEFAULT_CASE()

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 0b75115233a764a22dd123a6077646dbb28e6469..c17d2c5ff582b890ae527ebab17d6d79128b4437 100644 (file)
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -34,8 +34,8 @@ typedef struct _zend_rsrc_list_entry {
        int refcount;
 } zend_rsrc_list_entry;
 
-typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc);
-#define ZEND_RSRC_DTOR_FUNC(name)              void name(zend_rsrc_list_entry *rsrc)
+typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+#define ZEND_RSRC_DTOR_FUNC(name)              void name(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 
 typedef struct _zend_rsrc_list_dtors_entry {
        /* old style destructors */