MFH (making oci8 able to compile with Oracle 10)

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 69fe4466b2758e8cbd3b4c8dd16b197db902fa4d..e10c54745a17f24e4d4ca308401d71f2226d77d8 100644 (file)
--- 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 830efe70d343b3d88a84c9fc8de30cb38b746647..0cd2ea28ab38bbed4930912b26c432f5aa732293 100644 (file)
--- 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));