cvs: php4 /ext/ingres_ii ii.c ii.h
| From: | Jani Taskinen | Date: | Mon, 30 Jul 2001 21:02:26 +0000 |
| Subject: | cvs: php4 /ext/ingres_ii ii.c ii.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6430@lists.php.net to get a copy of this message | ||
sniper Mon Jul 30 17:02:26 2001 EDT
Modified files:
/php4/ext/ingres_ii ii.c ii.h
Log:
Make this extension compile in ZTS mode.
Index: php4/ext/ingres_ii/ii.c
diff -u php4/ext/ingres_ii/ii.c:1.21 php4/ext/ingres_ii/ii.c:1.22
--- php4/ext/ingres_ii/ii.c:1.21 Mon Jul 30 04:24:28 2001
+++ php4/ext/ingres_ii/ii.c Mon Jul 30 17:02:25 2001
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.c,v 1.21 2001/07/30 08:24:28 zeev Exp $ */
+/* $Id: ii.c,v 1.22 2001/07/30 21:02:25 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -193,7 +193,6 @@
{
II_LINK *link = (II_LINK *)rsrc->ptr;
IIAPI_AUTOPARM autoParm;
- TSRMLS_FETCH();
if(link->autocommit) {
@@ -239,7 +238,7 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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) {
Index: php4/ext/ingres_ii/ii.h
diff -u php4/ext/ingres_ii/ii.h:1.7 php4/ext/ingres_ii/ii.h:1.8
--- php4/ext/ingres_ii/ii.h:1.7 Sat Jul 28 07:35:56 2001
+++ php4/ext/ingres_ii/ii.h Mon Jul 30 17:02:26 2001
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.h,v 1.7 2001/07/28 11:35:56 zeev Exp $ */
+/* $Id: ii.h,v 1.8 2001/07/30 21:02:26 sniper Exp $ */
#ifndef II_H
#define II_H
@@ -46,7 +46,7 @@
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);