Merge branch 'master' into jsond

Conflicts:
	ext/json/JSON_parser.c
	ext/json/JSON_parser.h
	ext/json/config.m4
	ext/json/config.w32
	ext/json/json.c
	ext/json/php_json.h

1 files changed, 215 insertions, 215 deletions

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 6c73ad0a32..a8a5662855 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -56,12 +56,12 @@ PHP_FUNCTION(oci_define_by_name)
 	php_oci_statement *statement;
 	php_oci_define *define, *tmp_define;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/|l", &stmt, &name, &name_len, &var, &type) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz/|l", &stmt, &name, &name_len, &var, &type) == FAILURE) {
 		return;
 	}
 
 	if (!name_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Column name cannot be empty");
+		php_error_docref(NULL, E_WARNING, "Column name cannot be empty");
 		RETURN_FALSE;
 	}
 
@@ -106,7 +106,7 @@ PHP_FUNCTION(oci_bind_by_name)
 	zval *bind_var = NULL;
 	php_oci_statement *statement;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/|ll", &z_statement, &name, &name_len, &bind_var, &maxlen, &type) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz/|ll", &z_statement, &name, &name_len, &bind_var, &maxlen, &type) == FAILURE) {
 		return;
 	}
 
@@ -116,7 +116,7 @@ PHP_FUNCTION(oci_bind_by_name)
 	
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_bind_by_name(statement, name, name_len, bind_var, maxlen, bind_type TSRMLS_CC)) {
+	if (php_oci_bind_by_name(statement, name, name_len, bind_var, maxlen, bind_type)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -136,7 +136,7 @@ PHP_FUNCTION(oci_bind_array_by_name)
 	zval *bind_var = NULL;
 	php_oci_statement *statement;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/l|ll", &z_statement, &name, &name_len, &bind_var, &max_array_len, &max_item_len, &type) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz/l|ll", &z_statement, &name, &name_len, &bind_var, &max_array_len, &max_item_len, &type) == FAILURE) {
 		return;
 	}
 
@@ -147,11 +147,11 @@ PHP_FUNCTION(oci_bind_array_by_name)
 	}
 	
 	if (max_array_len <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum array length must be greater than zero");
+		php_error_docref(NULL, E_WARNING, "Maximum array length must be greater than zero");
 		RETURN_FALSE;
 	}
 	
-	if (php_oci_bind_array_by_name(statement, name, name_len, bind_var, max_array_len, max_item_len, type TSRMLS_CC)) {
+	if (php_oci_bind_array_by_name(statement, name, name_len, bind_var, max_array_len, max_item_len, type)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -166,13 +166,13 @@ PHP_FUNCTION(oci_free_descriptor)
 	php_oci_descriptor *descriptor;
 
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 
@@ -195,29 +195,29 @@ PHP_FUNCTION(oci_lob_save)
 	ub4 bytes_written;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &offset) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &data, &data_len, &offset) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &offset) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &offset) == FAILURE) {
 			return;
 		}
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
 	if (offset < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset parameter must be greater than or equal to 0");
+		php_error_docref(NULL, E_WARNING, "Offset parameter must be greater than or equal to 0");
 		RETURN_FALSE;
 	}
 	
-	if (php_oci_lob_write(descriptor, offset, data, data_len, &bytes_written TSRMLS_CC)) {
+	if (php_oci_lob_write(descriptor, offset, data, data_len, &bytes_written)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -235,18 +235,18 @@ PHP_FUNCTION(oci_lob_import)
 
 	if (getThis()) {
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3) || (PHP_MAJOR_VERSION > 5)
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename, &filename_len) == FAILURE) {
 #else
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename, &filename_len) == FAILURE) {
 #endif
 			return;
 		}
 	}
 	else {
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3) || (PHP_MAJOR_VERSION > 5)
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Op", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len) == FAILURE) {
 #else
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len) == FAILURE) {
 #endif
 			return;
 		}	
@@ -255,19 +255,19 @@ PHP_FUNCTION(oci_lob_import)
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || (PHP_MAJOR_VERSION < 5)
 	/* The "p" parsing parameter handles this case in PHP 5.4+ */
 	if (strlen(filename) != filename_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot contain null bytes");
+		php_error_docref(NULL, E_WARNING, "Filename cannot contain null bytes");
 		RETURN_FALSE;  
 	}
 #endif
 
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_import(descriptor, filename TSRMLS_CC)) {
+	if (php_oci_lob_import(descriptor, filename)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -284,19 +284,19 @@ PHP_FUNCTION(oci_lob_load)
 	ub4 buffer_len;
 
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_read(descriptor, -1, 0, &buffer, &buffer_len TSRMLS_CC)) {
+	if (php_oci_lob_read(descriptor, -1, 0, &buffer, &buffer_len)) {
 		RETURN_FALSE;
 	}
 	if (buffer_len > 0) {
@@ -319,29 +319,29 @@ PHP_FUNCTION(oci_lob_read)
 	ub4 buffer_len;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &length) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol", &z_descriptor, oci_lob_class_entry_ptr, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_descriptor, oci_lob_class_entry_ptr, &length) == FAILURE) {
 			return;
 		}	
 	}
 
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
 	if (length <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0");
+		php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
 		RETURN_FALSE;
 	}
 	
-	if (php_oci_lob_read(descriptor, length, descriptor->lob_current_position, &buffer, &buffer_len TSRMLS_CC)) {
+	if (php_oci_lob_read(descriptor, length, descriptor->lob_current_position, &buffer, &buffer_len)) {
 		RETURN_FALSE;
 	}	
 	if (buffer_len > 0) {
@@ -362,19 +362,19 @@ PHP_FUNCTION(oci_lob_eof)
 	ub4 lob_length;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (!php_oci_lob_get_length(descriptor, &lob_length TSRMLS_CC) && lob_length >= 0) {
+	if (!php_oci_lob_get_length(descriptor, &lob_length) && lob_length >= 0) {
 		if (lob_length == descriptor->lob_current_position) {
 			RETURN_TRUE;
 		}
@@ -391,13 +391,13 @@ PHP_FUNCTION(oci_lob_tell)
 	php_oci_descriptor *descriptor;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
@@ -415,13 +415,13 @@ PHP_FUNCTION(oci_lob_rewind)
 	php_oci_descriptor *descriptor;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
@@ -443,24 +443,24 @@ PHP_FUNCTION(oci_lob_seek)
 	ub4 lob_length;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &offset, &whence) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &offset, &whence) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol|l", &z_descriptor, oci_lob_class_entry_ptr, &offset, &whence) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol|l", &z_descriptor, oci_lob_class_entry_ptr, &offset, &whence) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_get_length(descriptor, &lob_length TSRMLS_CC)) {
+	if (php_oci_lob_get_length(descriptor, &lob_length)) {
 		RETURN_FALSE;
 	}
 
@@ -494,19 +494,19 @@ PHP_FUNCTION(oci_lob_size)
 	ub4 lob_length;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (php_oci_lob_get_length(descriptor, &lob_length TSRMLS_CC)) {
+	if (php_oci_lob_get_length(descriptor, &lob_length)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(lob_length);
@@ -525,7 +525,7 @@ PHP_FUNCTION(oci_lob_write)
 	char *data;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &write_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &data, &data_len, &write_len) == FAILURE) {
 			return;
 		}
 		
@@ -534,7 +534,7 @@ PHP_FUNCTION(oci_lob_write)
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &write_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &write_len) == FAILURE) {
 			return;
 		}
 
@@ -544,7 +544,7 @@ PHP_FUNCTION(oci_lob_write)
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
@@ -554,7 +554,7 @@ PHP_FUNCTION(oci_lob_write)
 		RETURN_LONG(0);
 	}
 	
-	if (php_oci_lob_write(descriptor, descriptor->lob_current_position, data, data_len, &bytes_written TSRMLS_CC)) {
+	if (php_oci_lob_write(descriptor, descriptor->lob_current_position, data, data_len, &bytes_written)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(bytes_written);
@@ -569,30 +569,30 @@ PHP_FUNCTION(oci_lob_append)
 	php_oci_descriptor *descriptor_dest, *descriptor_from;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "OO", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_dest), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
 	if ((tmp_from = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_from), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_dest, descriptor_dest);
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_from, descriptor_from);
 	
-	if (php_oci_lob_append(descriptor_dest, descriptor_from TSRMLS_CC)) {
+	if (php_oci_lob_append(descriptor_dest, descriptor_from)) {
 		RETURN_FALSE;
 	}
 	/* XXX should we increase lob_size here ? */
@@ -610,30 +610,30 @@ PHP_FUNCTION(oci_lob_truncate)
 	ub4 ub_trim_length;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &trim_length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &trim_length) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|l", &z_descriptor, oci_lob_class_entry_ptr, &trim_length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l", &z_descriptor, oci_lob_class_entry_ptr, &trim_length) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 
 	if (trim_length < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length must be greater than or equal to zero");
+		php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to zero");
 		RETURN_FALSE;
 	}
 
 	ub_trim_length = (ub4) trim_length;
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (php_oci_lob_truncate(descriptor, ub_trim_length TSRMLS_CC)) {
+	if (php_oci_lob_truncate(descriptor, ub_trim_length)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -650,44 +650,44 @@ PHP_FUNCTION(oci_lob_erase)
 	zend_long offset = -1, length = -1;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &offset, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &offset, &length) == FAILURE) {
 			return;
 		}
 
 		if (ZEND_NUM_ARGS() > 0 && offset < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Offset must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 
 		if (ZEND_NUM_ARGS() > 1 && length < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|ll", &z_descriptor, oci_lob_class_entry_ptr, &offset, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|ll", &z_descriptor, oci_lob_class_entry_ptr, &offset, &length) == FAILURE) {
 			return;
 		}
 
 		if (ZEND_NUM_ARGS() > 1 && offset < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Offset must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 		
 		if (ZEND_NUM_ARGS() > 2 && length < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 	}
 
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_erase(descriptor, offset, length, &bytes_erased TSRMLS_CC)) {
+	if (php_oci_lob_erase(descriptor, offset, length, &bytes_erased)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(bytes_erased);
@@ -703,18 +703,18 @@ PHP_FUNCTION(oci_lob_flush)
 	zend_long flush_flag = 0;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flush_flag) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flush_flag) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|l", &z_descriptor, oci_lob_class_entry_ptr, &flush_flag) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l", &z_descriptor, oci_lob_class_entry_ptr, &flush_flag) == FAILURE) {
 			return;
 		}
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
@@ -725,7 +725,7 @@ PHP_FUNCTION(oci_lob_flush)
 		RETURN_FALSE;
 	}
 
-	if (php_oci_lob_flush(descriptor, flush_flag TSRMLS_CC)) {
+	if (php_oci_lob_flush(descriptor, flush_flag)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -741,24 +741,24 @@ PHP_FUNCTION(ocisetbufferinglob)
 	zend_bool flag;
 	
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &flag) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &flag) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ob", &z_descriptor, oci_lob_class_entry_ptr, &flag) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &z_descriptor, oci_lob_class_entry_ptr, &flag) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (php_oci_lob_set_buffering(descriptor, flag TSRMLS_CC)) {
+	if (php_oci_lob_set_buffering(descriptor, flag)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -773,13 +773,13 @@ PHP_FUNCTION(ocigetbufferinglob)
 	php_oci_descriptor *descriptor;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
@@ -800,17 +800,17 @@ PHP_FUNCTION(oci_lob_copy)
 	php_oci_descriptor *descriptor_dest, *descriptor_from;
 	zend_long length = 0;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "OO|l", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr, &length) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO|l", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr, &length) == FAILURE) {
 		return;
 	}
 	
 	if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_dest), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
 	if ((tmp_from = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_from), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
@@ -818,7 +818,7 @@ PHP_FUNCTION(oci_lob_copy)
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_from, descriptor_from);
 	
 	if (ZEND_NUM_ARGS() == 3 && length < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0");
+		php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
 		RETURN_FALSE;
 	}
 	
@@ -827,7 +827,7 @@ PHP_FUNCTION(oci_lob_copy)
 		length = -1;
 	}
 
-	if (php_oci_lob_copy(descriptor_dest, descriptor_from, length TSRMLS_CC)) {
+	if (php_oci_lob_copy(descriptor_dest, descriptor_from, length)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -842,24 +842,24 @@ PHP_FUNCTION(oci_lob_is_equal)
 	php_oci_descriptor *descriptor_first, *descriptor_second;
 	boolean is_equal;
 		
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "OO", &z_descriptor_first, oci_lob_class_entry_ptr, &z_descriptor_second, oci_lob_class_entry_ptr) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_descriptor_first, oci_lob_class_entry_ptr, &z_descriptor_second, oci_lob_class_entry_ptr) == FAILURE) {
 		return;
 	}
 	
 	if ((tmp_first = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_first), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
 	if ((tmp_second = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_second), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_first, descriptor_first);
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_second, descriptor_second);
 
-	if (php_oci_lob_is_equal(descriptor_first, descriptor_second, &is_equal TSRMLS_CC)) {
+	if (php_oci_lob_is_equal(descriptor_first, descriptor_second, &is_equal)) {
 		RETURN_FALSE;
 	}
 	
@@ -885,37 +885,37 @@ PHP_FUNCTION(oci_lob_export)
 
 	if (getThis()) {
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3) || (PHP_MAJOR_VERSION > 5)
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|ll", &filename, &filename_len, &start, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ll", &filename, &filename_len, &start, &length) == FAILURE) {
 #else
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &filename, &filename_len, &start, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &filename, &filename_len, &start, &length) == FAILURE) {
 #endif
 			return;
 		}
 	
 		if (ZEND_NUM_ARGS() > 1 && start < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Start parameter must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Start parameter must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 		if (ZEND_NUM_ARGS() > 2 && length < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Length parameter must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 	}
 	else {
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3) || (PHP_MAJOR_VERSION > 5)
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Op|ll", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len, &start, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op|ll", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len, &start, &length) == FAILURE) {
 #else
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os|ll", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len, &start, &length) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|ll", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len, &start, &length) == FAILURE) {
 #endif
 			return;
 		}
 			
 		if (ZEND_NUM_ARGS() > 2 && start < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Start parameter must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Start parameter must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 		if (ZEND_NUM_ARGS() > 3 && length < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Length parameter must be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 	}
@@ -923,19 +923,19 @@ PHP_FUNCTION(oci_lob_export)
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || (PHP_MAJOR_VERSION < 5)
 	/* The "p" parsing parameter handles this case in PHP 5.4+ */
 	if (strlen(filename) != filename_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot contain null bytes");
+		php_error_docref(NULL, E_WARNING, "Filename cannot contain null bytes");
 		RETURN_FALSE;  
 	}
 #endif
 
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (php_oci_lob_get_length(descriptor, &lob_length TSRMLS_CC)) {
+	if (php_oci_lob_get_length(descriptor, &lob_length)) {
 		RETURN_FALSE;
 	}		
 	
@@ -959,7 +959,7 @@ PHP_FUNCTION(oci_lob_export)
 	}
 #endif
 
-	if (php_check_open_basedir(filename TSRMLS_CC)) {
+	if (php_check_open_basedir(filename)) {
 		RETURN_FALSE;
 	}
 
@@ -976,7 +976,7 @@ PHP_FUNCTION(oci_lob_export)
 
 	while(length > 0) {
 		ub4 tmp_bytes_read = 0;
-		if (php_oci_lob_read(descriptor, block_length, start, &buffer, &tmp_bytes_read TSRMLS_CC)) {
+		if (php_oci_lob_read(descriptor, block_length, start, &buffer, &tmp_bytes_read)) {
 			php_stream_close(stream);
 			RETURN_FALSE;
 		}
@@ -1014,24 +1014,24 @@ PHP_FUNCTION(oci_lob_write_temporary)
 	zend_long type = OCI_TEMP_CLOB;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &type) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &data, &data_len, &type) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &type) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &type) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_write_tmp(descriptor, type, data, data_len TSRMLS_CC)) {
+	if (php_oci_lob_write_tmp(descriptor, type, data, data_len)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1046,19 +1046,19 @@ PHP_FUNCTION(oci_lob_close)
 	php_oci_descriptor *descriptor;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
+		php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
-	if (php_oci_lob_close(descriptor TSRMLS_CC)) {
+	if (php_oci_lob_close(descriptor)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1074,14 +1074,14 @@ PHP_FUNCTION(oci_new_descriptor)
 	php_oci_descriptor *descriptor;
 	zend_long type = OCI_DTYPE_LOB;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &z_connection, &type) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &z_connection, &type) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
 	/* php_oci_lob_create() checks type */
-	descriptor = php_oci_lob_create(connection, type TSRMLS_CC);	
+	descriptor = php_oci_lob_create(connection, type);	
 	
 	if (!descriptor) {
 		RETURN_NULL();
@@ -1099,17 +1099,17 @@ PHP_FUNCTION(oci_rollback)
 	zval *z_connection;
 	php_oci_connection *connection;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_connection) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
 	if (connection->descriptors) {
-		php_oci_connection_descriptors_free(connection TSRMLS_CC);
+		php_oci_connection_descriptors_free(connection);
 	}
 
-	if (php_oci_connection_rollback(connection TSRMLS_CC)) {
+	if (php_oci_connection_rollback(connection)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1123,17 +1123,17 @@ PHP_FUNCTION(oci_commit)
 	zval *z_connection;
 	php_oci_connection *connection;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_connection) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
 	if (connection->descriptors) {
-		php_oci_connection_descriptors_free(connection TSRMLS_CC);
+		php_oci_connection_descriptors_free(connection);
 	}
 	
-	if (php_oci_connection_commit(connection TSRMLS_CC)) {
+	if (php_oci_connection_commit(connection)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1321,13 +1321,13 @@ PHP_FUNCTION(oci_execute)
 	php_oci_statement *statement;
 	zend_long mode = OCI_COMMIT_ON_SUCCESS;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &z_statement, &mode) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &z_statement, &mode) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_statement_execute(statement, mode TSRMLS_CC)) {
+	if (php_oci_statement_execute(statement, mode)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1341,13 +1341,13 @@ PHP_FUNCTION(oci_cancel)
 	zval *z_statement;
 	php_oci_statement *statement;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_statement_cancel(statement TSRMLS_CC)) {
+	if (php_oci_statement_cancel(statement)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1362,13 +1362,13 @@ PHP_FUNCTION(oci_fetch)
 	php_oci_statement *statement;
 	ub4 nrows = 1; /* only one row at a time is supported for now */
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_statement_fetch(statement, nrows TSRMLS_CC)) {
+	if (php_oci_statement_fetch(statement, nrows)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1396,7 +1396,7 @@ PHP_FUNCTION(oci_fetch_all)
 	int i;
 	zend_long rows = 0, flags = 0, skip = 0, maxrows = -1;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/|lll", &z_statement, &array, &skip, &maxrows, &flags) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/|lll", &z_statement, &array, &skip, &maxrows, &flags) == FAILURE) {
 		return;
 	}
 
@@ -1406,7 +1406,7 @@ PHP_FUNCTION(oci_fetch_all)
 	array_init(array);
 
 	while (skip--) {
-		if (php_oci_statement_fetch(statement, nrows TSRMLS_CC)) {
+		if (php_oci_statement_fetch(statement, nrows)) {
 			RETURN_LONG(0);
 		}
 	}
@@ -1415,16 +1415,16 @@ PHP_FUNCTION(oci_fetch_all)
 		columns = safe_emalloc(statement->ncolumns, sizeof(php_oci_out_column *), 0);
 
 		for (i = 0; i < statement->ncolumns; i++) {
-			columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0 TSRMLS_CC);
+			columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0);
 		}
 
-		while (!php_oci_statement_fetch(statement, nrows TSRMLS_CC)) {
+		while (!php_oci_statement_fetch(statement, nrows)) {
 			zval row;
 			
 			array_init(&row);
 
 			for (i = 0; i < statement->ncolumns; i++) {
-				php_oci_column_to_zval(columns[ i ], &element, PHP_OCI_RETURN_LOBS TSRMLS_CC);
+				php_oci_column_to_zval(columns[ i ], &element, PHP_OCI_RETURN_LOBS);
 
 				if (flags & PHP_OCI_NUM) {
 					zend_hash_next_index_insert(Z_ARRVAL(row), &element);
@@ -1437,7 +1437,7 @@ PHP_FUNCTION(oci_fetch_all)
 			rows++;
 
 			if (maxrows != -1 && rows == maxrows) {
-				php_oci_statement_cancel(statement TSRMLS_CC);
+				php_oci_statement_cancel(statement);
 				break;
 			}
 		}
@@ -1449,30 +1449,30 @@ PHP_FUNCTION(oci_fetch_all)
 		
 		if (flags & PHP_OCI_NUM) {
 			for (i = 0; i < statement->ncolumns; i++) {
-				columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0 TSRMLS_CC);
+				columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0);
 				
 				array_init(&tmp);
 				outarrs[ i ] = zend_hash_next_index_insert(Z_ARRVAL_P(array), &tmp);
 			}
 		} else { /* default to ASSOC */
 			for (i = 0; i < statement->ncolumns; i++) {
-				columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0 TSRMLS_CC);
+				columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0);
 				
 				array_init(&tmp);
 				outarrs[ i ] = zend_symtable_update(Z_ARRVAL_P(array), zend_string_init(columns[ i ]->name, columns[ i ]->name_len+1, 0), &tmp);
 			}
 		}
 
-		while (!php_oci_statement_fetch(statement, nrows TSRMLS_CC)) {
+		while (!php_oci_statement_fetch(statement, nrows)) {
 			for (i = 0; i < statement->ncolumns; i++) {
-				php_oci_column_to_zval(columns[ i ], &element, PHP_OCI_RETURN_LOBS TSRMLS_CC);
+				php_oci_column_to_zval(columns[ i ], &element, PHP_OCI_RETURN_LOBS);
 				zend_hash_index_update(&(outarrs[ i ])->value.arr->ht, rows, &element);
 			}
 
 			rows++;
 
 			if (maxrows != -1 && rows == maxrows) {
-				php_oci_statement_cancel(statement TSRMLS_CC);
+				php_oci_statement_cancel(statement);
 				break;
 			}
 		}
@@ -1528,7 +1528,7 @@ PHP_FUNCTION(oci_free_statement)
 	zval *z_statement;
 	php_oci_statement *statement;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
@@ -1558,7 +1558,7 @@ PHP_FUNCTION(oci_close)
 		return;
 	}
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_connection) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
 		return;
 	}
 
@@ -1608,30 +1608,30 @@ PHP_FUNCTION(oci_error)
 	ub2 error_offset = 0;
 	text *sqltext = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &arg) == FAILURE) {
 		return;
 	}
 
 	if (ZEND_NUM_ARGS() > 0) {
-		statement = (php_oci_statement *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_statement);
+		statement = (php_oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_statement);
 		if (statement) {
 			errh = statement->err;
 			errcode = statement->errcode;
 
-			if (php_oci_fetch_sqltext_offset(statement, &sqltext, &error_offset TSRMLS_CC)) {
+			if (php_oci_fetch_sqltext_offset(statement, &sqltext, &error_offset)) {
 				RETURN_FALSE;
 			}
 			goto go_out;
 		}
 
-		connection = (php_oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
+		connection = (php_oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_connection);
 		if (connection) {
 			errh = connection->err;
 			errcode = connection->errcode;
 			goto go_out;
 		}
 
-		connection = (php_oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_pconnection);
+		connection = (php_oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_pconnection);
 		if (connection) {
 			errh = connection->err;
 			errcode = connection->errcode;
@@ -1648,11 +1648,11 @@ go_out:
 	}
 
 	if (!errh) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Oci_error: unable to find error handle");
+		php_error_docref(NULL, E_WARNING, "Oci_error: unable to find error handle");
 		RETURN_FALSE;
 	}
 
-	errcode = php_oci_fetch_errmsg(errh, &errbuf TSRMLS_CC);
+	errcode = php_oci_fetch_errmsg(errh, &errbuf);
 
 	if (errcode) {
 		array_init(return_value);
@@ -1675,7 +1675,7 @@ PHP_FUNCTION(oci_num_fields)
 	zval *z_statement;
 	php_oci_statement *statement;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
@@ -1695,13 +1695,13 @@ PHP_FUNCTION(oci_parse)
 	char *query;
 	size_t query_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &query, &query_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &query, &query_len) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
-	statement = php_oci_statement_create(connection, query, query_len TSRMLS_CC);
+	statement = php_oci_statement_create(connection, query, query_len);
 
 	if (statement) {
 		RETURN_RES(statement->id);
@@ -1718,18 +1718,18 @@ PHP_FUNCTION(oci_set_prefetch)
 	php_oci_statement *statement;
 	zend_long size;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &z_statement, &size) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &z_statement, &size) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
 	if (size < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of rows to be prefetched has to be greater than or equal to 0");
+		php_error_docref(NULL, E_WARNING, "Number of rows to be prefetched has to be greater than or equal to 0");
 		return;
 	}
 
-	if (php_oci_statement_set_prefetch(statement, (ub4)size TSRMLS_CC)) {
+	if (php_oci_statement_set_prefetch(statement, (ub4)size)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1746,7 +1746,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 	size_t client_id_len;
 	sword errstatus;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &client_id, &client_id_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &client_id, &client_id_len) == FAILURE) {
 		return;
 	}
 
@@ -1755,7 +1755,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 	PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, ((dvoid *) connection->session, (ub4) OCI_HTYPE_SESSION, (dvoid *) client_id, (ub4) client_id_len, (ub4) OCI_ATTR_CLIENT_IDENTIFIER, connection->err));
 
 	if (errstatus != OCI_SUCCESS) {
-		connection->errcode = php_oci_error(connection->err, errstatus TSRMLS_CC);
+		connection->errcode = php_oci_error(connection->err, errstatus);
 		RETURN_FALSE;
 	}
 
@@ -1795,7 +1795,7 @@ PHP_FUNCTION(oci_set_edition)
 	char *edition;
 	size_t edition_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &edition, &edition_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &edition, &edition_len) == FAILURE) {
 		return;
 	}
 
@@ -1813,7 +1813,7 @@ PHP_FUNCTION(oci_set_edition)
 
 	RETURN_TRUE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unsupported attribute type");
+	php_error_docref(NULL, E_NOTICE, "Unsupported attribute type");
 	RETURN_FALSE;
 #endif
 }
@@ -1830,7 +1830,7 @@ PHP_FUNCTION(oci_set_module_name)
 	size_t module_len;
 	sword errstatus;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &module, &module_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &module, &module_len) == FAILURE) {
 		return;
 	}
 
@@ -1839,13 +1839,13 @@ PHP_FUNCTION(oci_set_module_name)
 	PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, ((dvoid *) connection->session, (ub4) OCI_HTYPE_SESSION, (dvoid *) module, (ub4) module_len, (ub4) OCI_ATTR_MODULE, connection->err));
 
 	if (errstatus != OCI_SUCCESS) {
-		connection->errcode = php_oci_error(connection->err, errstatus TSRMLS_CC);
+		connection->errcode = php_oci_error(connection->err, errstatus);
 		RETURN_FALSE;
 	}
 
 	RETURN_TRUE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unsupported attribute type");
+	php_error_docref(NULL, E_NOTICE, "Unsupported attribute type");
 	RETURN_FALSE;
 #endif
 }
@@ -1862,7 +1862,7 @@ PHP_FUNCTION(oci_set_action)
 	size_t action_len;
 	sword errstatus;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &action, &action_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &action, &action_len) == FAILURE) {
 		return;
 	}
 
@@ -1871,13 +1871,13 @@ PHP_FUNCTION(oci_set_action)
 	PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, ((dvoid *) connection->session, (ub4) OCI_HTYPE_SESSION, (dvoid *) action, (ub4) action_len, (ub4) OCI_ATTR_ACTION, connection->err));
 
 	if (errstatus != OCI_SUCCESS) {
-		connection->errcode = php_oci_error(connection->err, errstatus TSRMLS_CC);
+		connection->errcode = php_oci_error(connection->err, errstatus);
 		RETURN_FALSE;
 	}
 
 	RETURN_TRUE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unsupported attribute type");
+	php_error_docref(NULL, E_NOTICE, "Unsupported attribute type");
 	RETURN_FALSE;
 #endif
 }
@@ -1894,7 +1894,7 @@ PHP_FUNCTION(oci_set_client_info)
 	size_t client_info_len;
 	sword errstatus;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &client_info, &client_info_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &client_info, &client_info_len) == FAILURE) {
 		return;
 	}
 
@@ -1903,13 +1903,13 @@ PHP_FUNCTION(oci_set_client_info)
 	PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, ((dvoid *) connection->session, (ub4) OCI_HTYPE_SESSION, (dvoid *) client_info, (ub4) client_info_len, (ub4) OCI_ATTR_CLIENT_INFO, connection->err));
 
 	if (errstatus != OCI_SUCCESS) {
-		connection->errcode = php_oci_error(connection->err, errstatus TSRMLS_CC);
+		connection->errcode = php_oci_error(connection->err, errstatus);
 		RETURN_FALSE;
 	}
 
 	RETURN_TRUE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unsupported attribute type");
+	php_error_docref(NULL, E_NOTICE, "Unsupported attribute type");
 	RETURN_FALSE;
 #endif
 }
@@ -1926,7 +1926,7 @@ PHP_FUNCTION(oci_set_db_operation)
 	char *dbop_name;
 	size_t dbop_name_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &dbop_name, &dbop_name_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_connection, &dbop_name, &dbop_name_len) == FAILURE) {
 		return;
 	}
 
@@ -1935,12 +1935,12 @@ PHP_FUNCTION(oci_set_db_operation)
 	PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrSet, ((dvoid *) connection->session, (ub4) OCI_HTYPE_SESSION, (dvoid *) dbop_name, (ub4) dbop_name_len, (ub4) OCI_ATTR_DBOP, OCI_G(err)));
 
 	if (OCI_G(errcode) != OCI_SUCCESS) {
-		php_oci_error(OCI_G(err), OCI_G(errcode) TSRMLS_CC);
+		php_oci_error(OCI_G(err), OCI_G(errcode));
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
 #else
-	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unsupported attribute type");
+	php_error_docref(NULL, E_NOTICE, "Unsupported attribute type");
 	RETURN_FALSE;
 #endif
 }
@@ -1959,47 +1959,47 @@ PHP_FUNCTION(oci_password_change)
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || (PHP_MAJOR_VERSION < 5)
 	/* Safe mode has been removed in PHP 5.4 */
 	if (PG(safe_mode)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "is disabled in Safe Mode");
+		php_error_docref(NULL, E_WARNING, "is disabled in Safe Mode");
 		RETURN_FALSE;
 	}
 #endif
 
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &z_connection, &user, &user_len, &pass_old, &pass_old_len, &pass_new, &pass_new_len) == SUCCESS) {
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "rsss", &z_connection, &user, &user_len, &pass_old, &pass_old_len, &pass_new, &pass_new_len) == SUCCESS) {
 		PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
 		if (!user_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "username cannot be empty");
+			php_error_docref(NULL, E_WARNING, "username cannot be empty");
 			RETURN_FALSE;
 		}
 		if (!pass_old_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "old password cannot be empty");
+			php_error_docref(NULL, E_WARNING, "old password cannot be empty");
 			RETURN_FALSE;
 		}
 		if (!pass_new_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "new password cannot be empty");
+			php_error_docref(NULL, E_WARNING, "new password cannot be empty");
 			RETURN_FALSE;
 		}
 
-		if (php_oci_password_change(connection, user, user_len, pass_old, pass_old_len, pass_new, pass_new_len TSRMLS_CC)) {
+		if (php_oci_password_change(connection, user, user_len, pass_old, pass_old_len, pass_new, pass_new_len)) {
 			RETURN_FALSE;
 		}
 		RETURN_TRUE;
-	} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &dbname, &dbname_len, &user, &user_len, &pass_old, &pass_old_len, &pass_new, &pass_new_len) == SUCCESS) {
+	} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ssss", &dbname, &dbname_len, &user, &user_len, &pass_old, &pass_old_len, &pass_new, &pass_new_len) == SUCCESS) {
 
 		if (!user_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "username cannot be empty");
+			php_error_docref(NULL, E_WARNING, "username cannot be empty");
 			RETURN_FALSE;
 		}
 		if (!pass_old_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "old password cannot be empty");
+			php_error_docref(NULL, E_WARNING, "old password cannot be empty");
 			RETURN_FALSE;
 		}
 		if (!pass_new_len) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "new password cannot be empty");
+			php_error_docref(NULL, E_WARNING, "new password cannot be empty");
 			RETURN_FALSE;
 		}
 
-		connection = php_oci_do_connect_ex(user, user_len, pass_old, pass_old_len, pass_new, pass_new_len, dbname, dbname_len, NULL, OCI_DEFAULT, 0, 0 TSRMLS_CC);
+		connection = php_oci_do_connect_ex(user, user_len, pass_old, pass_old_len, pass_new, pass_new_len, dbname, dbname_len, NULL, OCI_DEFAULT, 0, 0);
 		if (!connection) {
 			RETURN_FALSE;
 		}
@@ -2017,13 +2017,13 @@ PHP_FUNCTION(oci_new_cursor)
 	php_oci_connection *connection;
 	php_oci_statement *statement;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_connection) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
-	statement = php_oci_statement_create(connection, NULL, 0 TSRMLS_CC);
+	statement = php_oci_statement_create(connection, NULL, 0);
 	
 	if (statement) {
 		RETURN_RES(statement->id);
@@ -2040,7 +2040,7 @@ PHP_FUNCTION(oci_result)
 	
 	column = php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 	if(column) {
-		php_oci_column_to_zval(column, return_value, 0 TSRMLS_CC);
+		php_oci_column_to_zval(column, return_value, 0);
 	}
 	else {
 		RETURN_FALSE;
@@ -2054,7 +2054,7 @@ PHP_FUNCTION(oci_client_version)
 {
 	char *version = NULL;
 
-	php_oci_client_get_version(&version TSRMLS_CC);
+	php_oci_client_get_version(&version);
 	RETURN_STRING(version);
 }
 /* }}} */
@@ -2067,13 +2067,13 @@ PHP_FUNCTION(oci_server_version)
 	php_oci_connection *connection;
 	char *version = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_connection) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
-	if (php_oci_server_get_version(connection, &version TSRMLS_CC)) {
+	if (php_oci_server_get_version(connection, &version)) {
 		RETURN_FALSE;
 	}
 	
@@ -2089,13 +2089,13 @@ PHP_FUNCTION(oci_statement_type)
 	php_oci_statement *statement;
 	ub2 type;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_statement_get_type(statement, &type TSRMLS_CC)) {
+	if (php_oci_statement_get_type(statement, &type)) {
 		RETURN_FALSE;
 	}
 
@@ -2144,13 +2144,13 @@ PHP_FUNCTION(oci_num_rows)
 	php_oci_statement *statement;
 	ub4 rowcount;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	if (php_oci_statement_get_numrows(statement, &rowcount TSRMLS_CC)) {
+	if (php_oci_statement_get_numrows(statement, &rowcount)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(rowcount);
@@ -2165,13 +2165,13 @@ PHP_FUNCTION(oci_free_collection)
 	php_oci_collection *collection;
 
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
@@ -2192,24 +2192,24 @@ PHP_FUNCTION(oci_collection_append)
 	size_t value_len;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &value, &value_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os", &z_collection, oci_coll_class_entry_ptr, &value, &value_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_collection, oci_coll_class_entry_ptr, &value, &value_len) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_append(collection, value, value_len TSRMLS_CC)) {
+	if (php_oci_collection_append(collection, value, value_len)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -2226,24 +2226,24 @@ PHP_FUNCTION(oci_collection_element_get)
 	zval value;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &element_index) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &element_index) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol", &z_collection, oci_coll_class_entry_ptr, &element_index) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_collection, oci_coll_class_entry_ptr, &element_index) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_element_get(collection, element_index, &value TSRMLS_CC)) {
+	if (php_oci_collection_element_get(collection, element_index, &value)) {
 		RETURN_FALSE;
 	}
 	
@@ -2259,30 +2259,30 @@ PHP_FUNCTION(oci_collection_assign)
 	php_oci_collection *collection_dest, *collection_from;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_collection_from, oci_coll_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection_from, oci_coll_class_entry_ptr) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "OO", &z_collection_dest, oci_coll_class_entry_ptr, &z_collection_from, oci_coll_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_collection_dest, oci_coll_class_entry_ptr, &z_collection_from, oci_coll_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_collection_dest), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property. The first argument should be valid collection object");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property. The first argument should be valid collection object");
 		RETURN_FALSE;
 	}
 
 	if ((tmp_from = zend_hash_str_find(Z_OBJPROP_P(z_collection_from), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property. The second argument should be valid collection object");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property. The second argument should be valid collection object");
 		RETURN_FALSE;
 	}
 
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp_dest, collection_dest);
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp_from, collection_from);
 
-	if (php_oci_collection_assign(collection_dest, collection_from TSRMLS_CC)) {
+	if (php_oci_collection_assign(collection_dest, collection_from)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -2300,24 +2300,24 @@ PHP_FUNCTION(oci_collection_element_assign)
 	char *value;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &element_index, &value, &value_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "ls", &element_index, &value, &value_len) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ols", &z_collection, oci_coll_class_entry_ptr, &element_index, &value, &value_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ols", &z_collection, oci_coll_class_entry_ptr, &element_index, &value, &value_len) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_element_set(collection, element_index, value, value_len TSRMLS_CC)) {
+	if (php_oci_collection_element_set(collection, element_index, value, value_len)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -2333,19 +2333,19 @@ PHP_FUNCTION(oci_collection_size)
 	sb4 size = 0;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_size(collection, &size TSRMLS_CC)) {
+	if (php_oci_collection_size(collection, &size)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(size);
@@ -2361,19 +2361,19 @@ PHP_FUNCTION(oci_collection_max)
 	zend_long max;
 	
 	if (!getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_max(collection, &max TSRMLS_CC)) {
+	if (php_oci_collection_max(collection, &max)) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(max);
@@ -2389,24 +2389,24 @@ PHP_FUNCTION(oci_collection_trim)
 	zend_long trim_size;
 
 	if (getThis()) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &trim_size) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &trim_size) == FAILURE) {
 			return;
 		}
 	}
 	else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol", &z_collection, oci_coll_class_entry_ptr, &trim_size) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_collection, oci_coll_class_entry_ptr, &trim_size) == FAILURE) {
 			return;
 		}	
 	}
 	
 	if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "descriptor", sizeof("descriptor"))) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find collection property");
+		php_error_docref(NULL, E_WARNING, "Unable to find collection property");
 		RETURN_FALSE;
 	}
 	
 	PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
-	if (php_oci_collection_trim(collection, trim_size TSRMLS_CC)) {
+	if (php_oci_collection_trim(collection, trim_size)) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;	
@@ -2423,13 +2423,13 @@ PHP_FUNCTION(oci_new_collection)
 	char *tdo, *schema = NULL;
 	size_t tdo_len, schema_len = 0;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s", &z_connection, &tdo, &tdo_len, &schema, &schema_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|s", &z_connection, &tdo, &tdo_len, &schema, &schema_len) == FAILURE) {
 		return;
 	}
 	
 	PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 	
-	if ( (collection = php_oci_collection_create(connection, tdo, tdo_len, schema, schema_len TSRMLS_CC)) ) {
+	if ( (collection = php_oci_collection_create(connection, tdo, tdo_len, schema, schema_len)) ) {
 		object_init_ex(return_value, oci_coll_class_entry_ptr);
 		add_property_resource(return_value, "collection", collection->id);
 	}
@@ -2447,16 +2447,16 @@ PHP_FUNCTION(oci_get_implicit_resultset)
 	php_oci_statement *statement;
 	php_oci_statement *imp_statement;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_statement) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_statement) == FAILURE) {
 		return;
 	}
 
 	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-	imp_statement = php_oci_get_implicit_resultset(statement TSRMLS_CC);
+	imp_statement = php_oci_get_implicit_resultset(statement);
 
 	if (imp_statement) {
-		if (php_oci_statement_execute(imp_statement, (ub4)OCI_DEFAULT TSRMLS_CC))
+		if (php_oci_statement_execute(imp_statement, (ub4)OCI_DEFAULT))
 			RETURN_FALSE;
 		RETURN_RES(imp_statement->id);
 	}