--- ext/oci8/config.m4.orig 2004-02-25 22:24:54.000000000 +0100 +++ ext/oci8/config.m4 2004-02-25 20:05:52.000000000 +0100 @@ -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 @@ -115,6 +117,15 @@ ]) ;; + + + 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!) ;; --- ext/oci8/oci8.c.orig 2004-02-25 22:25:03.000000000 +0100 +++ ext/oci8/oci8.c 2004-02-25 20:11:45.000000000 +0100 @@ -4804,7 +4804,7 @@ CALL_OCI_RETURN(connection->error, OCICollAppend( connection->session->pEnv, connection->pError, - (dword *)0, + (dvoid *)0, /* (dword *)0, */ &null_ind, coll->coll)); if (connection->error) { @@ -5110,7 +5110,7 @@ connection->session->pEnv, connection->pError, ndx, - (dword *)0, + (dvoid *)0, /* (dword *)0, */ &null_ind, coll->coll)); if (connection->error) { @@ -5143,7 +5143,7 @@ connection->session->pEnv, connection->pError, ndx, - (dword *)&dt, + (dvoid *)&dt, /* (dword *)&dt, */ &new_ind, coll->coll)); @@ -5171,7 +5171,7 @@ connection->session->pEnv, connection->pError, ndx, - (dword *)ocistr, + (dvoid *)ocistr, /* (dword *)ocistr, */ &new_ind, coll->coll)); @@ -5210,7 +5210,7 @@ connection->session->pEnv, connection->pError, ndx, - (dword *)&num, + (dvoid *)&num, /* (dword *)&num, */ &new_ind, coll->coll));