cvs: php-src(PHP_5_3) /ext/oci8 oci8.c
| From: | Pierre-Alain Joye | Date: | Tue, 05 Aug 2008 20:56:25 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52007@lists.php.net to get a copy of this message | ||
pajoye Tue Aug 5 20:56:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c
Log:
- MFH: fix oci8_11g when build shared (invalid extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.20&r2=1.269.2.16.2.38.2.21&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.20 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.21
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.20 Thu Jul 24 15:24:14 2008
+++ php-src/ext/oci8/oci8.c Tue Aug 5 20:56:25 2008
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.20 2008/07/24 15:24:14 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.21 2008/08/05 20:56:25 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -107,7 +107,7 @@
/* }}} */
/* {{{ dynamically loadable module stuff */
-#ifdef COMPILE_DL_OCI8
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
ZEND_GET_MODULE(oci8)
#endif /* COMPILE_DL */
/* }}} */
@@ -1018,7 +1018,7 @@
zend_module_entry oci8_module_entry = {
STANDARD_MODULE_HEADER,
- "oci8", /* extension name */
+ "oci8_11g", /* extension name */
php_oci_functions, /* extension function list */
PHP_MINIT(oci), /* extension-wide startup function */
PHP_MSHUTDOWN(oci), /* extension-wide shutdown function */
@@ -1311,7 +1311,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.20 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.21 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);