From 7a37f532efb4d545d918f644313748453b7c54b8 Mon Sep 17 00:00:00 2001 From: foobar Date: Mon, 30 Jul 2001 21:02:27 +0000 Subject: Make this extension compile in ZTS mode. --- ext/ingres_ii/ii.c | 17 ++++++++--------- ext/ingres_ii/ii.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'ext/ingres_ii') diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c index 11d31a0e64..ed931de2e5 100644 --- a/ext/ingres_ii/ii.c +++ b/ext/ingres_ii/ii.c @@ -193,7 +193,6 @@ static void _clean_ii_plink(zend_rsrc_list_entry *rsrc) { II_LINK *link = (II_LINK *)rsrc->ptr; IIAPI_AUTOPARM autoParm; - TSRMLS_FETCH(); if(link->autocommit) { @@ -239,7 +238,7 @@ static void php_ii_set_default_link(int id) if none has been set, tries to open a new one with default parameters */ -static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC) +static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (IIG(default_link)==-1) { /* no link opened yet, implicitly open one */ ht = 0; @@ -662,7 +661,7 @@ PHP_FUNCTION(ingres_query) } if (argc < 2) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); @@ -734,7 +733,7 @@ PHP_FUNCTION(ingres_num_rows) } if (argc < 1) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); @@ -775,7 +774,7 @@ PHP_FUNCTION(ingres_num_fields) } if (argc < 1) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); @@ -808,7 +807,7 @@ static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type) } if (argc < 2) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); @@ -1189,7 +1188,7 @@ PHP_FUNCTION(ingres_fetch_array) } if (argc != 2) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } if (argc != 0) { @@ -1218,7 +1217,7 @@ PHP_FUNCTION(ingres_fetch_row) } if (argc != 1) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); @@ -1242,7 +1241,7 @@ PHP_FUNCTION(ingres_fetch_object) } if (argc != 2) { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); } if (argc != 0) { diff --git a/ext/ingres_ii/ii.h b/ext/ingres_ii/ii.h index 675f64a55f..ba31243942 100644 --- a/ext/ingres_ii/ii.h +++ b/ext/ingres_ii/ii.h @@ -46,7 +46,7 @@ static int _close_statement(II_LINK *link); static int _rollback_transaction(II_LINK *link); static void _close_ii_link(II_LINK *link); static void _close_ii_plink(zend_rsrc_list_entry *link); -static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC); +static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS); static void php_ii_set_default_link(int id); static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); static char *php_ii_field_name(II_LINK *ii_link, int index); -- cgit v1.2.1