first shot remove TSRMLS_* things

1 files changed, 75 insertions, 75 deletions

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 43e585dd33..a297e0de38 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -42,7 +42,7 @@ static HashTable xmlreader_prop_handlers;
 typedef int (*xmlreader_read_int_t)(xmlTextReaderPtr reader);
 typedef unsigned char *(*xmlreader_read_char_t)(xmlTextReaderPtr reader);
 typedef const unsigned char *(*xmlreader_read_const_char_t)(xmlTextReaderPtr reader);
-typedef int (*xmlreader_write_t)(xmlreader_object *obj, zval *newval TSRMLS_DC);
+typedef int (*xmlreader_write_t)(xmlreader_object *obj, zval *newval);
 
 typedef unsigned char *(*xmlreader_read_one_char_t)(xmlTextReaderPtr reader, const unsigned char *);
 
@@ -57,7 +57,7 @@ typedef struct _xmlreader_prop_handler {
 #define XMLREADER_LOAD_FILE 1
 
 /* {{{ xmlreader_register_prop_handler */
-static void xmlreader_register_prop_handler(HashTable *prop_handler, char *name, xmlreader_read_int_t read_int_func, xmlreader_read_const_char_t read_char_func, int rettype TSRMLS_DC)
+static void xmlreader_register_prop_handler(HashTable *prop_handler, char *name, xmlreader_read_int_t read_int_func, xmlreader_read_const_char_t read_char_func, int rettype)
 {
 	xmlreader_prop_handler hnd;
 
@@ -69,7 +69,7 @@ static void xmlreader_register_prop_handler(HashTable *prop_handler, char *name,
 /* }}} */
 
 /* {{{ xmlreader_property_reader */
-static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handler *hnd, zval *rv TSRMLS_DC)
+static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handler *hnd, zval *rv)
 {
 	const xmlChar *retchar = NULL;
 	int retint = 0;
@@ -81,7 +81,7 @@ static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handl
 			if (hnd->read_int_func) {
 				retint = hnd->read_int_func(obj->ptr);
 				if (retint == -1) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal libxml error returned");
+					php_error_docref(NULL, E_WARNING, "Internal libxml error returned");
 					return FAILURE;
 				}
 			}
@@ -112,7 +112,7 @@ static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handl
 /* }}} */
 
 /* {{{ xmlreader_get_property_ptr_ptr */
-zval *xmlreader_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot TSRMLS_DC)
+zval *xmlreader_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot)
 {
 	xmlreader_object *obj;
 	zval tmp_member;
@@ -135,7 +135,7 @@ zval *xmlreader_get_property_ptr_ptr(zval *object, zval *member, int type, void
 
 	if (hnd == NULL) {
 		std_hnd = zend_get_std_object_handlers();
-		retval = std_hnd->get_property_ptr_ptr(object, member, type, cache_slot TSRMLS_CC);
+		retval = std_hnd->get_property_ptr_ptr(object, member, type, cache_slot);
 	}
 
 	if (member == &tmp_member) {
@@ -147,7 +147,7 @@ zval *xmlreader_get_property_ptr_ptr(zval *object, zval *member, int type, void
 /* }}} */
 
 /* {{{ xmlreader_read_property */
-zval *xmlreader_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv TSRMLS_DC)
+zval *xmlreader_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv)
 {
 	xmlreader_object *obj;
 	zval tmp_member;
@@ -169,14 +169,14 @@ zval *xmlreader_read_property(zval *object, zval *member, int type, void **cache
 	}
 
 	if (hnd != NULL) {
-		if (xmlreader_property_reader(obj, hnd, rv TSRMLS_CC) == FAILURE) {
+		if (xmlreader_property_reader(obj, hnd, rv) == FAILURE) {
 			retval = &EG(uninitialized_zval);
 		} else {
 			retval = rv;
 		}
 	} else {
 		std_hnd = zend_get_std_object_handlers();
-		retval = std_hnd->read_property(object, member, type, cache_slot, rv TSRMLS_CC);
+		retval = std_hnd->read_property(object, member, type, cache_slot, rv);
 	}
 
 	if (member == &tmp_member) {
@@ -187,7 +187,7 @@ zval *xmlreader_read_property(zval *object, zval *member, int type, void **cache
 /* }}} */
 
 /* {{{ xmlreader_write_property */
-void xmlreader_write_property(zval *object, zval *member, zval *value, void **cache_slot TSRMLS_DC)
+void xmlreader_write_property(zval *object, zval *member, zval *value, void **cache_slot)
 {
 	xmlreader_object *obj;
 	zval tmp_member;
@@ -207,10 +207,10 @@ void xmlreader_write_property(zval *object, zval *member, zval *value, void **ca
 		hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member));
 	}
 	if (hnd != NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write to read-only property");
+		php_error_docref(NULL, E_WARNING, "Cannot write to read-only property");
 	} else {
 		std_hnd = zend_get_std_object_handlers();
-		std_hnd->write_property(object, member, value, cache_slot TSRMLS_CC);
+		std_hnd->write_property(object, member, value, cache_slot);
 	}
 
 	if (member == &tmp_member) {
@@ -222,7 +222,7 @@ void xmlreader_write_property(zval *object, zval *member, zval *value, void **ca
 /* {{{ _xmlreader_get_valid_file_path */
 /* _xmlreader_get_valid_file_path and _xmlreader_get_relaxNG should be made a
 	common function in libxml extension as code is common to a few xml extensions */
-char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
+char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len ) {
 	xmlURI *uri;
 	xmlChar *escsource;
 	char *file_dest;
@@ -255,7 +255,7 @@ char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int reso
 	file_dest = source;
 
 	if ((uri->scheme == NULL || isFileUri)) {
-		if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path TSRMLS_CC)) {
+		if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path)) {
 			xmlFreeURI(uri);
 			return NULL;
 		}
@@ -272,7 +272,7 @@ char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int reso
 /* {{{ _xmlreader_get_relaxNG */
 static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, size_t type,
 											xmlRelaxNGValidityErrorFunc error_func,
-											xmlRelaxNGValidityWarningFunc warn_func TSRMLS_DC)
+											xmlRelaxNGValidityWarningFunc warn_func)
 {
 	char *valid_file = NULL;
 	xmlRelaxNGParserCtxtPtr parser = NULL;
@@ -281,7 +281,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
 
 	switch (type) {
 	case XMLREADER_LOAD_FILE:
-		valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN  TSRMLS_CC);
+		valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN );
 		if (!valid_file) {
 			return NULL;
 		}
@@ -341,7 +341,7 @@ ZEND_GET_MODULE(xmlreader)
 #endif
 
 /* {{{ xmlreader_objects_clone */
-void xmlreader_objects_clone(void *object, void **object_clone TSRMLS_DC)
+void xmlreader_objects_clone(void *object, void **object_clone)
 {
 	/* TODO */
 }
@@ -370,23 +370,23 @@ static void xmlreader_free_resources(xmlreader_object *intern) {
 /* }}} */
 
 /* {{{ xmlreader_objects_free_storage */
-void xmlreader_objects_free_storage(zend_object *object TSRMLS_DC)
+void xmlreader_objects_free_storage(zend_object *object)
 {
 	xmlreader_object *intern = php_xmlreader_fetch_object(object);
 
-	zend_object_std_dtor(&intern->std TSRMLS_CC);
+	zend_object_std_dtor(&intern->std);
 
 	xmlreader_free_resources(intern);
 }
 /* }}} */
 
 /* {{{ xmlreader_objects_new */
-zend_object *xmlreader_objects_new(zend_class_entry *class_type TSRMLS_DC)
+zend_object *xmlreader_objects_new(zend_class_entry *class_type)
 {
 	xmlreader_object *intern;
 
 	intern = ecalloc(1, sizeof(xmlreader_object) + sizeof(zval) * (class_type->default_properties_count - 1));
-	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
+	zend_object_std_init(&intern->std, class_type);
 	object_properties_init(&intern->std, class_type);
 	intern->prop_handler = &xmlreader_prop_handlers;
 	intern->std.handlers = &xmlreader_object_handlers;
@@ -403,12 +403,12 @@ static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_rea
 	xmlreader_object *intern;
 	char *name;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
 		return;
 	}
 
 	if (!name_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument cannot be an empty string");
+		php_error_docref(NULL, E_WARNING, "Argument cannot be an empty string");
 		RETURN_FALSE;
 	}
 
@@ -486,12 +486,12 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
 	xmlRelaxNGPtr schema = NULL;
 	char *source;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p!", &source, &source_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p!", &source, &source_len) == FAILURE) {
 		return;
 	}
 
 	if (source != NULL && !source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Schema data source is required");
+		php_error_docref(NULL, E_WARNING, "Schema data source is required");
 		RETURN_FALSE;
 	}
 
@@ -500,7 +500,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
 	intern = Z_XMLREADER_P(id);
 	if (intern && intern->ptr) {
 		if (source) {
-			schema =  _xmlreader_get_relaxNG(source, source_len, type, NULL, NULL TSRMLS_CC);
+			schema =  _xmlreader_get_relaxNG(source, source_len, type, NULL, NULL);
 			if (schema) {
 				retval = xmlTextReaderRelaxNGSetSchema(intern->ptr, schema);
 			}
@@ -520,11 +520,11 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
 		}
 	}
 
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors.");
+	php_error_docref(NULL, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors.");
 
 	RETURN_FALSE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml.");
+	php_error_docref(NULL, E_WARNING, "No Schema support built into libxml.");
 
 	RETURN_FALSE;
 #endif
@@ -566,7 +566,7 @@ PHP_METHOD(xmlreader, getAttributeNo)
 	char *retchar = NULL;
 	xmlreader_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &attr_pos) == FAILURE) {
 		return;
 	}
 
@@ -592,12 +592,12 @@ PHP_METHOD(xmlreader, getAttributeNs)
 	xmlreader_object *intern;
 	char *name, *ns_uri, *retchar = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
 		return;
 	}
 
 	if (name_len == 0 || ns_uri_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
+		php_error_docref(NULL, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
 		RETURN_FALSE;
 	}
 
@@ -623,7 +623,7 @@ PHP_METHOD(xmlreader, getParserProperty)
 	int retval = -1;
 	xmlreader_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &property) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &property) == FAILURE) {
 		return;
 	}
 
@@ -634,7 +634,7 @@ PHP_METHOD(xmlreader, getParserProperty)
 		retval = xmlTextReaderGetParserProp(intern->ptr,property);
 	}
 	if (retval == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parser property");
+		php_error_docref(NULL, E_WARNING, "Invalid parser property");
 		RETURN_FALSE;
 	}
 
@@ -670,12 +670,12 @@ PHP_METHOD(xmlreader, moveToAttribute)
 	xmlreader_object *intern;
 	char *name;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
 		return;
 	}
 
 	if (name_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name is required");
+		php_error_docref(NULL, E_WARNING, "Attribute Name is required");
 		RETURN_FALSE;
 	}
 
@@ -703,7 +703,7 @@ PHP_METHOD(xmlreader, moveToAttributeNo)
 	int retval;
 	xmlreader_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &attr_pos) == FAILURE) {
 		return;
 	}
 
@@ -732,12 +732,12 @@ PHP_METHOD(xmlreader, moveToAttributeNs)
 	xmlreader_object *intern;
 	char *name, *ns_uri;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
 		return;
 	}
 
 	if (name_len == 0 || ns_uri_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
+		php_error_docref(NULL, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
 		RETURN_FALSE;
 	}
 
@@ -798,7 +798,7 @@ PHP_METHOD(xmlreader, read)
 		}
 	}
 
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to read");
+	php_error_docref(NULL, E_WARNING, "Load Data before trying to read");
 	RETURN_FALSE;
 }
 /* }}} */
@@ -813,7 +813,7 @@ PHP_METHOD(xmlreader, next)
 	xmlreader_object *intern;
 	char *name = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &name, &name_len) == FAILURE) {
 		return;
 	}
 
@@ -840,7 +840,7 @@ PHP_METHOD(xmlreader, next)
 		}
 	}
 
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to read");
+	php_error_docref(NULL, E_WARNING, "Load Data before trying to read");
 	RETURN_FALSE;
 }
 /* }}} */
@@ -858,13 +858,13 @@ PHP_METHOD(xmlreader, open)
 	char resolved_path[MAXPATHLEN + 1];
 	xmlTextReaderPtr reader = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) {
 		return;
 	}
 
 	id = getThis();
 	if (id != NULL) {
-		if (! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry TSRMLS_CC)) {
+		if (! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry)) {
 			id = NULL;
 		} else {
 			intern = Z_XMLREADER_P(id);
@@ -873,18 +873,18 @@ PHP_METHOD(xmlreader, open)
 	}
 
 	if (!source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input");
+		php_error_docref(NULL, E_WARNING, "Empty string supplied as input");
 		RETURN_FALSE;
 	}
 
-	valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN  TSRMLS_CC);
+	valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN );
 
 	if (valid_file) {
 		reader = xmlReaderForFile(valid_file, encoding, options);
 	}
 
 	if (reader == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open source data");
+		php_error_docref(NULL, E_WARNING, "Unable to open source data");
 		RETURN_FALSE;
 	}
 
@@ -945,12 +945,12 @@ PHP_METHOD(xmlreader, setSchema)
 	xmlreader_object *intern;
 	char *source;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p!", &source, &source_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p!", &source, &source_len) == FAILURE) {
 		return;
 	}
 
 	if (source != NULL && !source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Schema data source is required");
+		php_error_docref(NULL, E_WARNING, "Schema data source is required");
 		RETURN_FALSE;
 	}
 
@@ -965,11 +965,11 @@ PHP_METHOD(xmlreader, setSchema)
 		}
 	}
 
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors.");
+	php_error_docref(NULL, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors.");
 
 	RETURN_FALSE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml.");
+	php_error_docref(NULL, E_WARNING, "No Schema support built into libxml.");
 
 	RETURN_FALSE;
 #endif
@@ -988,7 +988,7 @@ PHP_METHOD(xmlreader, setParserProperty)
 	zend_bool value;
 	xmlreader_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lb", &property, &value) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "lb", &property, &value) == FAILURE) {
 		return;
 	}
 
@@ -999,7 +999,7 @@ PHP_METHOD(xmlreader, setParserProperty)
 		retval = xmlTextReaderSetParserProp(intern->ptr,property, value);
 	}
 	if (retval == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parser property");
+		php_error_docref(NULL, E_WARNING, "Invalid parser property");
 		RETURN_FALSE;
 	}
 
@@ -1043,12 +1043,12 @@ PHP_METHOD(xmlreader, XML)
 	xmlParserInputBufferPtr inputbfr;
 	xmlTextReaderPtr reader;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) {
 		return;
 	}
 
 	id = getThis();
-	if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry TSRMLS_CC)) {
+	if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry)) {
 		id = NULL;
 	}
 	if (id != NULL) {
@@ -1057,7 +1057,7 @@ PHP_METHOD(xmlreader, XML)
 	}
 
 	if (!source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input");
+		php_error_docref(NULL, E_WARNING, "Empty string supplied as input");
 		RETURN_FALSE;
 	}
 
@@ -1110,7 +1110,7 @@ PHP_METHOD(xmlreader, XML)
 	if (inputbfr) {
 		xmlFreeParserInputBuffer(inputbfr);
 	}
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load source data");
+	php_error_docref(NULL, E_WARNING, "Unable to load source data");
 	RETURN_FALSE;
 }
 /* }}} */
@@ -1127,7 +1127,7 @@ PHP_METHOD(xmlreader, expand)
 	xmlDocPtr docp = NULL;
 	php_libxml_node_object *domobj = NULL;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!", &id, xmlreader_class_entry, &basenode, dom_node_class_entry) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!", &id, xmlreader_class_entry, &basenode, dom_node_class_entry) == FAILURE) {
 		return;
 	}
 
@@ -1142,19 +1142,19 @@ PHP_METHOD(xmlreader, expand)
 		node = xmlTextReaderExpand(intern->ptr);
 
 		if (node == NULL) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while expanding ");
+			php_error_docref(NULL, E_WARNING, "An Error Occurred while expanding ");
 			RETURN_FALSE;
 		} else {
 			nodec = xmlDocCopyNode(node, docp, 1);
 			if (nodec == NULL) {
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot expand this node type");
+				php_error_docref(NULL, E_NOTICE, "Cannot expand this node type");
 				RETURN_FALSE;
 			} else {
 				DOM_RET_OBJ(nodec, &ret, (dom_object *)domobj);
 			}
 		}
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to expand");
+		php_error_docref(NULL, E_WARNING, "Load Data before trying to expand");
 		RETURN_FALSE;
 	}
 #else
@@ -1315,23 +1315,23 @@ PHP_MINIT_FUNCTION(xmlreader)
 
 	INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions);
 	ce.create_object = xmlreader_objects_new;
-	xmlreader_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+	xmlreader_class_entry = zend_register_internal_class(&ce);
 
 	zend_hash_init(&xmlreader_prop_handlers, 0, NULL, php_xmlreader_free_prop_handler, 1);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "attributeCount", xmlTextReaderAttributeCount, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "baseURI", NULL, xmlTextReaderConstBaseUri, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "depth", xmlTextReaderDepth, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasAttributes", xmlTextReaderHasAttributes, NULL, IS_FALSE TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasValue", xmlTextReaderHasValue, NULL, IS_FALSE TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isDefault", xmlTextReaderIsDefault, NULL, IS_FALSE TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isEmptyElement", xmlTextReaderIsEmptyElement, NULL, IS_FALSE TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "localName", NULL, xmlTextReaderConstLocalName, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "name", NULL, xmlTextReaderConstName, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "namespaceURI", NULL, xmlTextReaderConstNamespaceUri, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "nodeType", xmlTextReaderNodeType, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "prefix", NULL, xmlTextReaderConstPrefix, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "value", NULL, xmlTextReaderConstValue, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "xmlLang", NULL, xmlTextReaderConstXmlLang, IS_STRING TSRMLS_CC);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "attributeCount", xmlTextReaderAttributeCount, NULL, IS_LONG);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "baseURI", NULL, xmlTextReaderConstBaseUri, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "depth", xmlTextReaderDepth, NULL, IS_LONG);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasAttributes", xmlTextReaderHasAttributes, NULL, IS_FALSE);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasValue", xmlTextReaderHasValue, NULL, IS_FALSE);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isDefault", xmlTextReaderIsDefault, NULL, IS_FALSE);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isEmptyElement", xmlTextReaderIsEmptyElement, NULL, IS_FALSE);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "localName", NULL, xmlTextReaderConstLocalName, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "name", NULL, xmlTextReaderConstName, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "namespaceURI", NULL, xmlTextReaderConstNamespaceUri, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "nodeType", xmlTextReaderNodeType, NULL, IS_LONG);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "prefix", NULL, xmlTextReaderConstPrefix, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "value", NULL, xmlTextReaderConstValue, IS_STRING);
+	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "xmlLang", NULL, xmlTextReaderConstXmlLang, IS_STRING);
 
 	/* Constants for NodeType - cannot define common types to share with dom as there are differences in these types */