cvs: php4(PHP_4_3) /ext/oci8 config.m4 oci8.c
| From: | Jani Taskinen | Date: | Wed, 30 Apr 2003 10:20:14 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/oci8 config.m4 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20598@lists.php.net to get a copy of this message | ||
sniper Wed Apr 30 06:20:14 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/oci8 config.m4 oci8.c
Log:
MFH: compile fixes for < 9.2 oracle
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.37.2.5 php4/ext/oci8/config.m4:1.37.2.6
--- php4/ext/oci8/config.m4:1.37.2.5 Wed Apr 9 08:00:54 2003
+++ php4/ext/oci8/config.m4 Wed Apr 30 06:20:14 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37.2.5 2003/04/09 12:00:54 edink Exp $
+dnl $Id: config.m4,v 1.37.2.6 2003/04/30 10:20:14 sniper Exp $
dnl
AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -101,7 +101,20 @@
PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
- AC_DEFINE(HAVE_OCI9,1,[ ])
+
+ dnl These functions are only available in version >= 9.2
+ PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate,
+ [
+ PHP_CHECK_LIBRARY(clntsh, OCINlsCharSetNameToId,
+ [
+ AC_DEFINE(HAVE_OCI_9_2,1,[ ])
+ OCI8_VERSION=9.2
+ ], [], [
+ -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
+ ])
+ ], [], [
+ -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
+ ])
;;
*)
@@ -116,16 +129,15 @@
[
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
], [
- unset ac_cv_func_ocilobistemporary
PHP_CHECK_LIBRARY(ocijdbc8, OCILobIsTemporary,
[
PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
], [], [
- $OCI8_SHARED_LIBADD
+ -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
])
], [
- $OCI8_SHARED_LIBADD
+ -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
])
PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared)
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.183.2.3 php4/ext/oci8/oci8.c:1.183.2.4
--- php4/ext/oci8/oci8.c:1.183.2.3 Mon Apr 21 13:53:59 2003
+++ php4/ext/oci8/oci8.c Wed Apr 30 06:20:14 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.183.2.3 2003/04/21 17:53:59 sniper Exp $ */
+/* $Id: oci8.c,v 1.183.2.4 2003/04/30 10:20:14 sniper Exp $ */
/* TODO list:
*
@@ -641,7 +641,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.3 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.4 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -2153,7 +2153,7 @@
oci_session *session = 0, *psession = 0;
OCISvcCtx *svchp = 0;
char *hashed_details;
-#ifdef HAVE_OCI9
+#ifdef HAVE_OCI_9_2
ub2 charsetid = 0;
#endif
TSRMLS_FETCH();
@@ -2204,7 +2204,7 @@
session->server = server;
session->exclusive = exclusive;
-#ifdef HAVE_OCI9
+#ifdef HAVE_OCI_9_2
/* following chunk is Oracle 9i+ ONLY */
if (*charset) {
@@ -2242,7 +2242,7 @@
session->pEnv = OCI(pEnv);
session->charsetId = 0;
-#endif /* HAVE_OCI9 */
+#endif /* HAVE_OCI_9_2 */
/* allocate temporary Service Context */
CALL_OCI_RETURN(OCI(error), OCIHandleAlloc(
@@ -2349,7 +2349,7 @@
return psession;
- CLEANUP:
+CLEANUP:
oci_debug("_oci_open_session: FAILURE -> CLEANUP called");
_oci_close_session(session);
@@ -2526,7 +2526,7 @@
return pserver;
- CLEANUP:
+CLEANUP:
oci_debug("_oci_open_server: FAILURE -> CLEANUP called");
_oci_close_server(server);
@@ -2769,7 +2769,7 @@
RETURN_RESOURCE(connection->id);
- CLEANUP:
+CLEANUP:
oci_debug("oci_do_connect: FAILURE -> CLEANUP called");
if (connection->id) {
@@ -3415,7 +3415,7 @@
RETURN_TRUE;
}
- bail:
+bail:
if (fp != -1) {
close(fp);
}