rrichards Thu Jan 24 14:09:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c oci8_lob.c
Log:
MFH: fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.5&r2=1.269.2.16.2.38.2.6&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.5
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.6
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.5 Fri Jan 18 16:03:51 2008
+++ php-src/ext/oci8/oci8.c Thu Jan 24 14:09:36 2008
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.5 2008/01/18 16:03:51 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.6 2008/01/24 14:09:36 rrichards Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", "1.2.4");
- php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.5
$");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.6
$");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1637,7 +1637,7 @@
lob_fetch_status = php_oci_lob_read(descriptor, -1, 0,
&lob_buffer, &lob_length TSRMLS_CC);
#ifdef HAVE_OCI8_TEMP_LOB
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
#endif
if (lob_fetch_status) {
ZVAL_FALSE(value);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.14.2.2&r2=1.7.2.6.2.14.2.3&diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.2
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.3
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.2 Tue Jan 15 20:44:31 2008
+++ php-src/ext/oci8/oci8_lob.c Thu Jan 24 14:09:36 2008
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.2 2008/01/15 20:44:31 sixd Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.3 2008/01/24 14:09:36 rrichards Exp $ */
@@ -579,7 +579,7 @@
return 1;
}
- if (php_oci_temp_lob_close(descriptor)) {
+ if (php_oci_temp_lob_close(descriptor TSRMLS_CC)) {
return 1;
}
@@ -676,7 +676,7 @@
#ifdef HAVE_OCI8_TEMP_LOB
if (descriptor->type == OCI_DTYPE_LOB) {
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
