cvs: php4 /ext/fbsql php_fbsql.c

fmk Tue Jul 2 17:36:11 2002 EDT Modified files: /php4/ext/fbsql php_fbsql.c Log: Fixing compilation of FrontBase extension with ZTS Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.81 php4/ext/fbsql/php_fbsql.c:1.82 --- php4/ext/fbsql/php_fbsql.c:1.81 Thu Jun 27 02:44:11 2002 +++ php4/ext/fbsql/php_fbsql.c Tue Jul 2 17:36:11 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.81 2002/06/27 06:44:11 derick Exp $ */ +/* $Id: php_fbsql.c,v 1.82 2002/07/02 21:36:11 fmk Exp $ */ /* TODO: * @@ -2232,7 +2232,7 @@ } /* }}} */ -void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* length, char** value) +void phpfbColumnAsString(PHPFBResult* result, int column, void* data , int* length, char** value TSRMLS_DC) { FBCMetaData* md = result->metaData; const FBCDatatypeMetaData* dtmd = fbcmdDatatypeMetaDataAtIndex(md, column); @@ -2495,7 +2495,7 @@ } else if (row[columnIndex]) { - phpfbColumnAsString(result, columnIndex, row[columnIndex], &Z_STRLEN_P(return_value), &Z_STRVAL_P(return_value)); + phpfbColumnAsString(result, columnIndex, row[columnIndex], &Z_STRLEN_P(return_value), &Z_STRVAL_P(return_value) TSRMLS_CC); Z_TYPE_P(return_value) = IS_STRING; } else @@ -2910,7 +2910,7 @@ char* value; unsigned int length; unsigned int c = 0; - phpfbColumnAsString(result, i, row[i], &length, &value); + phpfbColumnAsString(result, i, row[i], &length, &value TSRMLS_CC); if (result_type & FBSQL_NUM) { add_index_stringl(return_value, i, value, length, c); @@ -3004,7 +3004,7 @@ for (i=0; i < result->columnCount; i++) { unsigned length = 0; - if (result->row[i]) phpfbColumnAsString(result, i, result->row[i], &length, NULL); + if (result->row[i]) phpfbColumnAsString(result, i, result->row[i], &length, NULL TSRMLS_CC); add_index_long(return_value, i, length); } } @@ -3427,7 +3427,7 @@ result->columnIndex = 0; row = fbcrhRowAtIndex(result->rowHandler, index); - phpfbColumnAsString(result, 0, row[0], &length, &value); + phpfbColumnAsString(result, 0, row[0], &length, &value TSRMLS_CC); RETURN_STRINGL(value, length, 1); } /* }}} */