tony2001 Tue Feb 3 09:22:35 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/oci8 config.m4 oci8.c
Log:
MFH (making oci8 able to compile with Oracle 10)
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.37.2.8&r2=1.37.2.9&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.37.2.8 php-src/ext/oci8/config.m4:1.37.2.9
--- php-src/ext/oci8/config.m4:1.37.2.8 Fri Oct 3 01:25:39 2003
+++ php-src/ext/oci8/config.m4 Tue Feb 3 09:22:34 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37.2.8 2003/10/03 05:25:39 sniper Exp $
+dnl $Id: config.m4,v 1.37.2.9 2004/02/03 14:22:34 tony2001 Exp $
dnl
AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -23,6 +23,8 @@
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' |
cut -d: -f 6 | cut -c 2-4`
test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
+ elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
+ OCI8_VERSION=10.1
elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
OCI8_VERSION=9.0
elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
@@ -114,7 +116,12 @@
-L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
])
;;
-
+ 10.1)
+ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
+ AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+ AC_DEFINE(HAVE_OCI_9_2,1,[ ])
+ ;;
*)
AC_MSG_ERROR(Unsupported Oracle version!)
;;
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.10&r2=1.183.2.11&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.10 php-src/ext/oci8/oci8.c:1.183.2.11
--- php-src/ext/oci8/oci8.c:1.183.2.10 Mon Jan 26 09:04:22 2004
+++ php-src/ext/oci8/oci8.c Tue Feb 3 09:22:34 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.183.2.10 2004/01/26 14:04:22 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.11 2004/02/03 14:22:34 tony2001 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.10 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.11 $");
#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 );
@@ -4833,7 +4833,7 @@
CALL_OCI_RETURN(connection->error, OCICollAppend(
connection->session->pEnv,
connection->pError,
- (dword *)0,
+ (dvoid *)0,
&null_ind,
coll->coll));
if (connection->error) {
@@ -5139,7 +5139,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)0,
+ (dvoid *)0,
&null_ind,
coll->coll));
if (connection->error) {
@@ -5172,7 +5172,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)&dt,
+ (dvoid *)&dt,
&new_ind,
coll->coll));
@@ -5200,7 +5200,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)ocistr,
+ (dvoid *)ocistr,
&new_ind,
coll->coll));
@@ -5239,7 +5239,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)&num,
+ (dvoid *)&num,
&new_ind,
coll->coll));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
