tony2001 Tue Feb 3 09:21:10 2004 EDT
Modified files:
/php-src/ext/oci8 config.m4 oci8.c
Log:
-remove obsolete types
-changes in config.m4 to make oci8 to compile with Oracle 10g
(thanks to cjbj at hotmail dot com for reporting both problems)
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.49&r2=1.50&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.49 php-src/ext/oci8/config.m4:1.50
--- php-src/ext/oci8/config.m4:1.49 Thu Jan 15 01:30:22 2004
+++ php-src/ext/oci8/config.m4 Tue Feb 3 09:21:09 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.49 2004/01/15 06:30:22 sniper Exp $
+dnl $Id: config.m4,v 1.50 2004/02/03 14:21:09 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,13 @@
-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.246&r2=1.247&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.246 php-src/ext/oci8/oci8.c:1.247
--- php-src/ext/oci8/oci8.c:1.246 Mon Feb 2 03:26:15 2004
+++ php-src/ext/oci8/oci8.c Tue Feb 3 09:21:09 2004
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.246 2004/02/02 08:26:15 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.247 2004/02/03 14:21:09 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.246 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.247 $");
sprintf(buf, "%ld", num_persistent);
php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -6319,7 +6319,7 @@
OCICollAppend(
connection->session->pEnv,
connection->pError,
- (dword *)0,
+ (dvoid *)0,
&null_ind,
coll->coll
)
@@ -6667,7 +6667,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)0,
+ (dvoid *)0,
&null_ind,
coll->coll
)
@@ -6706,7 +6706,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)&dt,
+ (dvoid *)&dt,
&new_ind,
coll->coll
)
@@ -6740,7 +6740,7 @@
connection->session->pEnv,
connection->pError,
ndx,
- (dword *)ocistr,
+ (dvoid *)ocistr,
&new_ind,
coll->coll
)
@@ -6785,7 +6785,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
