sniper Thu Jan 1 21:21:45 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix ZTS build
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.228 php-src/ext/oci8/oci8.c:1.229
--- php-src/ext/oci8/oci8.c:1.228 Thu Dec 25 08:54:50 2003
+++ php-src/ext/oci8/oci8.c Thu Jan 1 21:21:44 2004
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.228 2003/12/25 13:54:50 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.229 2004/01/02 02:21:44 sniper Exp $ */
/* TODO list:
*
@@ -235,7 +235,7 @@
static sb4 oci_failover_callback(dvoid *svchp,dvoid* envhp,dvoid *fo_ctx,ub4 fo_type,
ub4 fo_event);
#endif
-static int oci_lob_flush(oci_descriptor*, int);
+static int oci_lob_flush(oci_descriptor *, int flush_flag TSRMLS_DC);
/* }}} */
/* {{{ extension macros */
@@ -775,7 +775,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.228 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.229 $");
sprintf(buf, "%ld", num_persistent);
php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -831,7 +831,7 @@
{
oci_descriptor *descr = *((oci_descriptor **)data);
if (descr->buffering == 2 && (descr->type == OCI_DTYPE_LOB || descr->type ==
OCI_DTYPE_FILE)) {
- oci_lob_flush(descr,OCI_LOB_BUFFER_FREE);
+ oci_lob_flush(descr,OCI_LOB_BUFFER_FREE TSRMLS_CC);
descr->buffering = 1;
}
}
@@ -1067,7 +1067,7 @@
/* flushing Lobs & Files with buffering enabled */
if ((descr->type == OCI_DTYPE_FILE || descr->type == OCI_DTYPE_LOB) &&
descr->buffering == 2) {
oci_debug("descriptor #%d needs to be flushed. flushing..",descr->id);
- oci_lob_flush(descr,OCI_LOB_BUFFER_FREE);
+ oci_lob_flush(descr,OCI_LOB_BUFFER_FREE TSRMLS_CC);
}
CALL_OCI(OCIDescriptorFree(
@@ -3226,7 +3226,8 @@
/* }}} */
/* {{{ oci_lob_flush() */
-static int oci_lob_flush(oci_descriptor* descr, int flush_flag) {
+static int oci_lob_flush(oci_descriptor* descr, int flush_flag TSRMLS_DC)
+{
OCILobLocator *mylob;
oci_connection *connection;
@@ -4396,7 +4397,7 @@
RETURN_FALSE;
}
- if (oci_lob_flush(descr,flush_flag) == 1) {
+ if (oci_lob_flush(descr,flush_flag TSRMLS_CC) == 1) {
RETURN_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
