--- embedaddon/php/Zend/zend_list.h	2012/02/21 23:47:52	1.1.1.1
+++ embedaddon/php/Zend/zend_list.h	2012/05/29 12:34:36	1.1.1.2
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_list.h,v 1.1.1.1 2012/02/21 23:47:52 misho Exp $ */
+/* $Id: zend_list.h,v 1.1.1.2 2012/05/29 12:34:36 misho Exp $ */
 
 #ifndef ZEND_LIST_H
 #define ZEND_LIST_H
@@ -48,7 +48,7 @@ typedef struct _zend_rsrc_list_dtors_entry {
 	rsrc_dtor_func_t list_dtor_ex;
 	rsrc_dtor_func_t plist_dtor_ex;
 
-	char *type_name;
+	const char *type_name;
 
 	int module_number;
 	int resource_id;
@@ -58,7 +58,7 @@ typedef struct _zend_rsrc_list_dtors_entry {
 
 #define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
 ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
-ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number);
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, const char *type_name, int module_number);
 
 void list_entry_destructor(void *ptr);
 void plist_entry_destructor(void *ptr);
@@ -70,7 +70,7 @@ void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC);
 int zend_init_rsrc_list_dtors(void);
 void zend_destroy_rsrc_list_dtors(void);
 
-ZEND_API int zend_list_insert(void *ptr, int type);
+ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
 ZEND_API int _zend_list_addref(ulong id TSRMLS_DC);
 ZEND_API int _zend_list_delete(ulong id TSRMLS_DC);
 ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC);
@@ -79,10 +79,10 @@ ZEND_API void *_zend_list_find(ulong id, int *type TSR
 #define zend_list_delete(id)		_zend_list_delete(id TSRMLS_CC)
 #define zend_list_find(id, type)	_zend_list_find(id, type TSRMLS_CC)
 
-ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
-ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
+ZEND_API int 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 char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC);
+ZEND_API const char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC);
 ZEND_API int zend_fetch_list_dtor_id(char *type_name);
 
 extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
@@ -107,7 +107,7 @@ extern ZEND_API int le_index_ptr;  /* list entry type 
 	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, 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);
+    zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type TSRMLS_CC);
 
 #define ZEND_GET_RESOURCE_TYPE_ID(le_id, le_type_name) \
     if (le_id == 0) {                                  \