From: Antony Dovgal <tony2001@php.net>
Date: Tue, 3 Feb 2004 14:22:34 +0000 (+0000)
Subject: MFH (making oci8 able to compile with Oracle 10)
X-Git-Tag: php-4.3.5RC2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55142148ad14e523c71dd5dfc717e1b99d65df66;p=php

MFH (making oci8 able to compile with Oracle 10)
---

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 69fe4466b2..e10c54745a 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -23,6 +23,8 @@ AC_DEFUN(AC_OCI8_VERSION,[
   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 @@ if test "$PHP_OCI8" != "no"; then
         -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!)
       ;;
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 830efe70d3..0cd2ea28ab 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -4833,7 +4833,7 @@ PHP_FUNCTION(ocicollappend)
 			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 @@ PHP_FUNCTION(ocicollassignelem)
 				  connection->session->pEnv, 
 				  connection->pError, 
 				  ndx, 
-				  (dword *)0, 
+				  (dvoid *)0, 
 				  &null_ind, 
 				  coll->coll));
 			if (connection->error) {
@@ -5172,7 +5172,7 @@ PHP_FUNCTION(ocicollassignelem)
 							connection->session->pEnv, 
 							connection->pError, 
 							ndx, 
-							(dword *)&dt, 
+							(dvoid *)&dt, 
 							&new_ind, 
 							coll->coll));
 
@@ -5200,7 +5200,7 @@ PHP_FUNCTION(ocicollassignelem)
 							connection->session->pEnv, 
 							connection->pError, 
 							ndx, 
-							(dword *)ocistr, 
+							(dvoid *)ocistr, 
 							&new_ind, 
 							coll->coll));
 
@@ -5239,7 +5239,7 @@ PHP_FUNCTION(ocicollassignelem)
 							connection->session->pEnv, 
 							connection->pError, 
 							ndx, 
-							(dword *)&num, 
+							(dvoid *)&num, 
 							&new_ind, 
 							coll->coll));