summaryrefslogtreecommitdiff
path: root/ext/interbase/php_ibase_udf.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-13 23:06:14 +0100
committerAnatol Belski <ab@php.net>2014-12-13 23:06:14 +0100
commitbdeb220f48825642f84cdbf3ff23a30613c92e86 (patch)
tree1a6cf34d20420e4815b4becb21311a4457d84103 /ext/interbase/php_ibase_udf.c
parentbb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff)
downloadphp-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/interbase/php_ibase_udf.c')
-rw-r--r--ext/interbase/php_ibase_udf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c
index 4b47fbcfb6..63c6a89fea 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -132,7 +132,7 @@ static void __attribute__((constructor)) init()
static void __attribute__((destructor)) fini()
{
- php_embed_shutdown(TSRMLS_C);
+ php_embed_shutdown();
}
#endif
@@ -156,14 +156,14 @@ void exec_php(BLOBCALLBACK b, PARAMDSC *res, ISC_SHORT *init)
default:
#ifdef PHP_EMBED
php_request_shutdown(NULL);
- if (FAILURE == (result = php_request_startup(TSRMLS_C))) {
+ if (FAILURE == (result = php_request_startup())) {
break;
}
case 0:
#endif
/* feed it to the parser */
zend_first_try {
- result = zend_eval_stringl(code, b->blob_total_length, NULL, "Firebird Embedded PHP engine" TSRMLS_CC);
+ result = zend_eval_stringl(code, b->blob_total_length, NULL, "Firebird Embedded PHP engine");
} zend_end_try();
}
@@ -192,7 +192,7 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
LOCK();
/* check if the requested function exists */
- if (!zend_is_callable(&callback, 0, NULL TSRMLS_CC)) {
+ if (!zend_is_callable(&callback, 0, NULL)) {
break;
}
@@ -286,7 +286,7 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
/* now call the function */
if (FAILURE == call_user_function(EG(function_table), NULL,
- &callback, &return_value, argc, args TSRMLS_CC)) {
+ &callback, &return_value, argc, args)) {
UNLOCK();
break;
}
@@ -345,7 +345,7 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
* that's not possible. We can however report it back to PHP.
*/
LOCK();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error calling function '%s' from database", name);
+ php_error_docref(NULL, E_WARNING, "Error calling function '%s' from database", name);
UNLOCK();
}