first shot remove TSRMLS_* things

1 files changed, 22 insertions, 22 deletions

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index f4e7d7b04d..fc63c4cb1d 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -27,8 +27,8 @@
 
 BEGIN_EXTERN_C()
 
-typedef void (*rsrc_dtor_func_t)(zend_resource *res TSRMLS_DC);
-#define ZEND_RSRC_DTOR_FUNC(name) void name(zend_resource *res TSRMLS_DC)
+typedef void (*rsrc_dtor_func_t)(zend_resource *res);
+#define ZEND_RSRC_DTOR_FUNC(name) void name(zend_resource *res)
 
 typedef struct _zend_rsrc_list_dtors_entry {
 	rsrc_dtor_func_t list_dtor_ex;
@@ -46,27 +46,27 @@ ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_fu
 void list_entry_destructor(zval *ptr);
 void plist_entry_destructor(zval *ptr);
 
-void zend_clean_module_rsrc_dtors(int module_number TSRMLS_DC);
-int zend_init_rsrc_list(TSRMLS_D);
-int zend_init_rsrc_plist(TSRMLS_D);
-void zend_close_rsrc_list(HashTable *ht TSRMLS_DC);
-void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC);
+void zend_clean_module_rsrc_dtors(int module_number);
+int zend_init_rsrc_list(void);
+int zend_init_rsrc_plist(void);
+void zend_close_rsrc_list(HashTable *ht);
+void zend_destroy_rsrc_list(HashTable *ht);
 int zend_init_rsrc_list_dtors(void);
 void zend_destroy_rsrc_list_dtors(void);
 
-ZEND_API zval *zend_list_insert(void *ptr, int type TSRMLS_DC);
-ZEND_API int _zend_list_free(zend_resource *res TSRMLS_DC);
-ZEND_API int _zend_list_delete(zend_resource *res TSRMLS_DC);
-ZEND_API int _zend_list_close(zend_resource *res TSRMLS_DC);
+ZEND_API zval *zend_list_insert(void *ptr, int type);
+ZEND_API int _zend_list_free(zend_resource *res);
+ZEND_API int _zend_list_delete(zend_resource *res);
+ZEND_API int _zend_list_close(zend_resource *res);
 
-#define zend_list_free(res)			_zend_list_free(res TSRMLS_CC)
-#define zend_list_delete(res)		_zend_list_delete(res TSRMLS_CC)
-#define zend_list_close(res)		_zend_list_close(res TSRMLS_CC)
+#define zend_list_free(res)			_zend_list_free(res)
+#define zend_list_delete(res)		_zend_list_delete(res)
+#define zend_list_close(res)		_zend_list_close(res)
 
-ZEND_API zend_resource *zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC);
-ZEND_API void *zend_fetch_resource(zval *passed_id TSRMLS_DC, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
+ZEND_API zend_resource *zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
+ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
 
-ZEND_API const char *zend_rsrc_list_get_rsrc_type(zend_resource *res TSRMLS_DC);
+ZEND_API const char *zend_rsrc_list_get_rsrc_type(zend_resource *res);
 ZEND_API int zend_fetch_list_dtor_id(const char *type_name);
 
 extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
@@ -77,21 +77,21 @@ extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
 	}
 
 #define ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type)	\
-	rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type);	\
+	rsrc = (rsrc_type) zend_fetch_resource(passed_id, default_id, resource_type_name, NULL, 1, resource_type);	\
 	ZEND_VERIFY_RESOURCE(rsrc);
 	
 #define ZEND_FETCH_RESOURCE_NO_RETURN(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type)	\
-	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type))
+	(rsrc = (rsrc_type) zend_fetch_resource(passed_id, default_id, resource_type_name, NULL, 1, resource_type))
 
 #define ZEND_FETCH_RESOURCE2(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type1, resource_type2)	\
-	rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2);	\
+	rsrc = (rsrc_type) zend_fetch_resource(passed_id, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2);	\
 	ZEND_VERIFY_RESOURCE(rsrc);
 	
 #define ZEND_FETCH_RESOURCE2_NO_RETURN(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type1, resource_type2)	\
-	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2))
+	(rsrc = (rsrc_type) zend_fetch_resource(passed_id, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2))
 
 #define ZEND_REGISTER_RESOURCE(rsrc_result, rsrc_pointer, rsrc_type)  \
-    zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type TSRMLS_CC);
+    zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type);
 
 #define ZEND_GET_RESOURCE_TYPE_ID(le_id, le_type_name) \
     if (le_id == 0) {                                  \