tony2001 Tue Aug 1 12:08:10 2006 UTC
Modified files:
/php-src/ext/oci8 oci8.c
Log:
improve error message on Win32
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.308&r2=1.309&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.308 php-src/ext/oci8/oci8.c:1.309
--- php-src/ext/oci8/oci8.c:1.308 Mon Jul 31 10:28:46 2006
+++ php-src/ext/oci8/oci8.c Tue Aug 1 12:08:10 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.308 2006/07/31 10:28:46 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.309 2006/08/01 12:08:10 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -667,7 +667,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", "1.2.1");
- php_info_print_table_row(2, "Revision", "$Revision: 1.308 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.309 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1189,7 +1189,11 @@
if (OCI_G(errcode) != OCI_SUCCESS) {
#ifdef HAVE_OCI_INSTANT_CLIENT
+# ifdef PHP_WIN32
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
PHP_OCI_INIT_FUNC_NAME "() failed. There is something wrong with your system -
please check that PATH includes the directory with Oracle Instant Client
libraries");
+# else
php_error_docref(NULL TSRMLS_CC, E_WARNING,
PHP_OCI_INIT_FUNC_NAME "() failed. There is something wrong with your system -
please check that LD_LIBRARY_PATH includes the directory with Oracle Instant
Client libraries");
+# endif
#else
php_error_docref(NULL TSRMLS_CC, E_WARNING,
PHP_OCI_INIT_FUNC_NAME "() failed. There is something wrong with your system -
please check that ORACLE_HOME is set and points to the right directory");
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
