sixd Tue Apr 1 18:37:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c php_oci8.h
Log:
Use new version macro. Make code portable to older PHP versions
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.12&r2=1.269.2.16.2.38.2.13&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.12
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.13
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.12 Tue Mar 25 02:00:28 2008
+++ php-src/ext/oci8/oci8.c Tue Apr 1 18:37:32 2008
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.12 2008/03/25 02:00:28 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.13 2008/04/01 18:37:32 sixd Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -409,7 +409,7 @@
PHP_RINIT(oci), /* per-request startup function */
PHP_RSHUTDOWN(oci), /* per-request shutdown function */
PHP_MINFO(oci), /* information function */
- "1.3.1",
+ PHP_OCI8_VERSION,
#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1) || (PHP_MAJOR_VERSION >
5)
/* This check allows PECL builds from this file to be portable to older
PHP releases */
PHP_MODULE_GLOBALS(oci), /* globals descriptor */
@@ -716,7 +716,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.12 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.13 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -724,7 +724,9 @@
php_info_print_table_row(2, "Active Connections", buf);
#if !defined(PHP_WIN32) && !defined(HAVE_OCI_INSTANT_CLIENT)
+#ifdef PHP_OCI8_ORACLE_VERSION
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_ORACLE_VERSION );
+#endif
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
php_info_print_table_row(2, "Libraries Used", PHP_OCI8_SHARED_LIBADD );
#else
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.3&r2=1.36.2.2.2.1.2.4&diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.3
php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.4
--- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.3 Tue Mar 25 02:00:31 2008
+++ php-src/ext/oci8/php_oci8.h Tue Apr 1 18:37:32 2008
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.3 2008/03/25 02:00:31 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.4 2008/04/01 18:37:32 sixd Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -39,6 +39,12 @@
/*
* The version of the OCI8 extension.
*/
+#ifdef PHP_OCI8_VERSION
+/* The definition of PHP_OCI8_VERSION changed in PHP 5.3 and building
+ * this code with PHP 5.2 and earlier (i.e. from PECL) might conflict
+ */
+#undef PHP_OCI8_VERSION
+#endif
#define PHP_OCI8_VERSION "1.3.1 Beta"
extern zend_module_entry oci8_module_entry;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
