diff options
| -rw-r--r-- | ext/oci8/config.m4 | 10 | ||||
| -rw-r--r-- | ext/oci8/oci8.c | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 240388aa44..adb60f587c 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,13 @@ 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 4bbc0194be..afe70092ef 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -6319,7 +6319,7 @@ PHP_FUNCTION(oci_collection_append) OCICollAppend( connection->session->pEnv, connection->pError, - (dword *)0, + (dvoid *)0, &null_ind, coll->coll ) @@ -6667,7 +6667,7 @@ PHP_FUNCTION(oci_collection_element_assign) connection->session->pEnv, connection->pError, ndx, - (dword *)0, + (dvoid *)0, &null_ind, coll->coll ) @@ -6706,7 +6706,7 @@ PHP_FUNCTION(oci_collection_element_assign) connection->session->pEnv, connection->pError, ndx, - (dword *)&dt, + (dvoid *)&dt, &new_ind, coll->coll ) @@ -6740,7 +6740,7 @@ PHP_FUNCTION(oci_collection_element_assign) connection->session->pEnv, connection->pError, ndx, - (dword *)ocistr, + (dvoid *)ocistr, &new_ind, coll->coll ) @@ -6785,7 +6785,7 @@ PHP_FUNCTION(oci_collection_element_assign) connection->session->pEnv, connection->pError, ndx, - (dword *)&num, + (dvoid *)&num, &new_ind, coll->coll ) |