Make this extension compile in ZTS mode.

foobar · foobar · commit 7a37f532efb4 · 2001-07-30T21:02:27.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ static void _clean_ii_plink(zend_rsrc_list_entry *rsrc)`
`193`	`193`	`{`
`194`	`194`	`II_LINK link = (II_LINK )rsrc->ptr;`
`195`	`195`	`IIAPI_AUTOPARM autoParm;`
`196`		`- TSRMLS_FETCH();`
`197`	`196`
`198`	`197`	`if(link->autocommit) {`
`199`	`198`
`@@ -239,7 +238,7 @@ static void php_ii_set_default_link(int id)`
`239`	`238`	`if none has been set, tries to open a new one with default`
`240`	`239`	`parameters`
`241`	`240`	`*/`
`242`		`-static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)`
	`241`	`+static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`243`	`242`	`{`
`244`	`243`	`if (IIG(default_link)==-1) { /* no link opened yet, implicitly open one */`
`245`	`244`	`ht = 0;`
`@@ -662,7 +661,7 @@ PHP_FUNCTION(ingres_query)`
`662`	`661`	`}`
`663`	`662`
`664`	`663`	`if (argc < 2) {`
`665`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`664`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`666`	`665`	`}`
`667`	`666`	`ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);`
`668`	`667`
`@@ -734,7 +733,7 @@ PHP_FUNCTION(ingres_num_rows)`
`734`	`733`	`}`
`735`	`734`
`736`	`735`	`if (argc < 1) {`
`737`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`736`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`738`	`737`	`}`
`739`	`738`
`740`	`739`	`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)`
`775`	`774`	`}`
`776`	`775`
`777`	`776`	`if (argc < 1) {`
`778`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`777`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`779`	`778`	`}`
`780`	`779`
`781`	`780`	`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)`
`808`	`807`	`}`
`809`	`808`
`810`	`809`	`if (argc < 2) {`
`811`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`810`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`812`	`811`	`}`
`813`	`812`
`814`	`813`	`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)`
`1189`	`1188`	`}`
`1190`	`1189`
`1191`	`1190`	`if (argc != 2) {`
`1192`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`1191`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`1193`	`1192`	`}`
`1194`	`1193`
`1195`	`1194`	`if (argc != 0) {`
`@@ -1218,7 +1217,7 @@ PHP_FUNCTION(ingres_fetch_row)`
`1218`	`1217`	`}`
`1219`	`1218`
`1220`	`1219`	`if (argc != 1) {`
`1221`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`1220`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`1222`	`1221`	`}`
`1223`	`1222`
`1224`	`1223`	`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)`
`1242`	`1241`	`}`
`1243`	`1242`
`1244`	`1243`	`if (argc != 2) {`
`1245`		`- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);`
	`1244`	`+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`1246`	`1245`	`}`
`1247`	`1246`
`1248`	`1247`	`if (argc != 0) {`