Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

1 files changed, 14 insertions, 14 deletions

diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index 5a64b31c75..72fc18d00f 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -36,7 +36,7 @@ static void _php_ibase_event_free(char *event_buf, char *result_buf) /* {{{ */
 }
 /* }}} */
 
-void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
+void _php_ibase_free_event(ibase_event *event) /* {{{ */
 {
 	unsigned short i;
 
@@ -47,7 +47,7 @@ void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
 
 		if (event->link->handle != NULL &&
 				isc_cancel_events(IB_STATUS, &event->link->handle, &event->event_id)) {
-			_php_ibase_error(TSRMLS_C);
+			_php_ibase_error();
 		}
 
 		/* delete this event from the link struct */
@@ -69,11 +69,11 @@ void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-static void _php_ibase_free_event_rsrc(zend_resource *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_event_rsrc(zend_resource *rsrc) /* {{{ */
 {
 	ibase_event *e = (ibase_event *) rsrc->ptr;
 
-	_php_ibase_free_event(e TSRMLS_CC);
+	_php_ibase_free_event(e);
 
 	efree(e);
 }
@@ -137,7 +137,7 @@ PHP_FUNCTION(ibase_wait_event)
 		WRONG_PARAM_COUNT;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &num_args) == FAILURE) {
 		return;
 	}
 
@@ -168,7 +168,7 @@ PHP_FUNCTION(ibase_wait_event)
 
 	/* now block until an event occurs */
 	if (isc_wait_for_event(IB_STATUS, &ib_link->handle, buffer_size, event_buffer, result_buffer)) {
-		_php_ibase_error(TSRMLS_C);
+		_php_ibase_error();
 		_php_ibase_event_free(event_buffer,result_buffer);
 		efree(args);
 		RETURN_FALSE;
@@ -232,8 +232,8 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
 
 			/* call the callback provided by the user */
 			if (SUCCESS != call_user_function(EG(function_table), NULL,
-					&event->callback, &return_value, 2, args TSRMLS_CC)) {
-				_php_ibase_module_error("Error calling callback %s" TSRMLS_CC, Z_STRVAL(event->callback));
+					&event->callback, &return_value, 2, args)) {
+				_php_ibase_module_error("Error calling callback %s", Z_STRVAL(event->callback));
 				break;
 			}
 
@@ -246,7 +246,7 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
 			if (isc_que_events(IB_STATUS, &event->link->handle, &event->event_id, buffer_size,
 				event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
 
-				_php_ibase_error(TSRMLS_C);
+				_php_ibase_error();
 			}
 			event->state = ACTIVE;
 	}
@@ -277,7 +277,7 @@ PHP_FUNCTION(ibase_set_event_handler)
 		WRONG_PARAM_COUNT;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &num_args) == FAILURE) {
 		return;
 	}
 
@@ -317,8 +317,8 @@ PHP_FUNCTION(ibase_set_event_handler)
 	}
 
 	/* get the callback */
-	if (!zend_is_callable(cb_arg, 0, &cb_name TSRMLS_CC)) {
-		_php_ibase_module_error("Callback argument %s is not a callable function" TSRMLS_CC, cb_name->val);
+	if (!zend_is_callable(cb_arg, 0, &cb_name)) {
+		_php_ibase_module_error("Callback argument %s is not a callable function", cb_name->val);
 		zend_string_release(cb_name);
 		RETURN_FALSE;
 	}
@@ -348,7 +348,7 @@ PHP_FUNCTION(ibase_set_event_handler)
 	if (isc_que_events(IB_STATUS, &ib_link->handle, &event->event_id, buffer_size,
 		event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
 
-		_php_ibase_error(TSRMLS_C);
+		_php_ibase_error();
 		efree(event);
 		RETURN_FALSE;
 	}
@@ -369,7 +369,7 @@ PHP_FUNCTION(ibase_free_event_handler)
 
 	RESET_ERRMSG;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &event_arg)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &event_arg)) {
 		ibase_event *event;
 
 		ZEND_FETCH_RESOURCE(event, ibase_event *, event_arg, -1, "Interbase event", le_event);