tony2001                Tue Jan 10 08:32:50 2006 UTC

  Modified files:              
    /php-src/ext/oci8   oci8.c 
  Log:
  silence compile warning in non-ZTS mode
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.289&r2=1.290&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.289 php-src/ext/oci8/oci8.c:1.290
--- php-src/ext/oci8/oci8.c:1.289       Tue Jan 10 08:29:19 2006
+++ php-src/ext/oci8/oci8.c     Tue Jan 10 08:32:49 2006
@@ -26,7 +26,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8.c,v 1.289 2006/01/10 08:29:19 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.290 2006/01/10 08:32:49 tony2001 Exp $ */
 /* TODO
  *
  * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() 
with OCI_ATTR_LOBEMPTY
@@ -88,7 +88,9 @@
 static void php_oci_collection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
 
 static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC);
+#ifdef ZTS
 static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC);
+#endif
 static int php_oci_connection_ping(php_oci_connection * TSRMLS_DC);
 static int php_oci_connection_status(php_oci_connection * TSRMLS_DC);
 static int php_oci_connection_close(php_oci_connection * TSRMLS_DC);
@@ -637,7 +639,7 @@
 
        php_info_print_table_start();
        php_info_print_table_row(2, "OCI8 Support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.289 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.290 $");
 
        sprintf(buf, "%ld", OCI_G(num_persistent));
        php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1728,6 +1730,7 @@
        return 0;
 } /* }}} */
 
+#ifdef ZTS
 /* {{{ php_oci_regular_helper() 
  Helper function to close non-persistent connections at the end of request in 
ZTS mode */
 static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC)
@@ -1742,5 +1745,6 @@
        }
        return 0;
 } /* }}} */
+#endif
 
 #endif /* HAVE_OCI8 */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to