sniper Fri Feb 21 01:46:28 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ingres_ii ii.c ii.h
Log:
MFH: ZTS build fixes
Index: php4/ext/ingres_ii/ii.c
diff -u php4/ext/ingres_ii/ii.c:1.31.8.2 php4/ext/ingres_ii/ii.c:1.31.8.3
--- php4/ext/ingres_ii/ii.c:1.31.8.2 Mon Feb 10 21:43:24 2003
+++ php4/ext/ingres_ii/ii.c Fri Feb 21 01:46:27 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.c,v 1.31.8.2 2003/02/11 02:43:24 sniper Exp $ */
+/* $Id: ii.c,v 1.31.8.3 2003/02/21 06:46:27 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -948,7 +948,7 @@
switch (info_type) {
case II_FIELD_INFO_NAME:
- name = php_ii_field_name(ii_link, index);
+ name = php_ii_field_name(ii_link, index TSRMLS_CC);
if (name == NULL) {
RETURN_FALSE;
}
@@ -1037,7 +1037,7 @@
/* Return the name of a field in a query result
*/
-static char *php_ii_field_name(II_LINK *ii_link, int index)
+static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC)
{
if (index < 1 || index > ii_link->fieldCount) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres II:
php_ii_field_name() called with wrong index (%d)", index);
@@ -1206,7 +1206,7 @@
add_index_null(return_value, i
+ k - 1);
}
if (result_type & II_ASSOC) {
- add_assoc_null(return_value,
php_ii_field_name(ii_link, i + k - 1));
+ add_assoc_null(return_value,
+php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC));
}
} else { /* non NULL value */
@@ -1241,7 +1241,7 @@
}
if (result_type &
II_ASSOC) {
-
add_assoc_double(return_value, php_ii_field_name(ii_link, i + k - 1), value_double);
+
+add_assoc_double(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC),
+value_double);
}
break;
@@ -1270,7 +1270,7 @@
}
if (result_type &
II_ASSOC) {
-
add_assoc_long(return_value, php_ii_field_name(ii_link, i + k - 1), value_long);
+
+add_assoc_long(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC),
+value_long);
}
break;
@@ -1311,7 +1311,7 @@
}
if (result_type &
II_ASSOC) {
-
add_assoc_stringl(return_value, php_ii_field_name (ii_link, i + k - 1), value_char_p,
len, should_copy);
+
+add_assoc_stringl(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC),
+value_char_p, len, should_copy);
}
/* eventualy restore
data pointer state for
Index: php4/ext/ingres_ii/ii.h
diff -u php4/ext/ingres_ii/ii.h:1.11.8.1 php4/ext/ingres_ii/ii.h:1.11.8.2
--- php4/ext/ingres_ii/ii.h:1.11.8.1 Tue Dec 31 11:34:45 2002
+++ php4/ext/ingres_ii/ii.h Fri Feb 21 01:46:27 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.h,v 1.11.8.1 2002/12/31 16:34:45 sebastian Exp $ */
+/* $Id: ii.h,v 1.11.8.2 2003/02/21 06:46:27 sniper Exp $ */
#ifndef II_H
#define II_H
@@ -43,13 +43,13 @@
#define II_OK 1
#define II_NO_DATA 2
static int _close_statement(II_LINK *link);
-static int _rollback_transaction(II_LINK *link);
+static int _rollback_transaction(II_LINK *link TSRMLS_DC);
static void _close_ii_link(II_LINK *link TSRMLS_DC);
static void _close_ii_plink(zend_rsrc_list_entry *link TSRMLS_DC);
static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS);
static void php_ii_set_default_link(int id TSRMLS_DC);
static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
-static char *php_ii_field_name(II_LINK *ii_link, int index);
+static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC);
static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type);
static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int
result_type);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
