Attachment #26403 for bug #42648

View | Details | Raw Unified | Return to bug 42648
Collapse All | Expand All

Lines 23-28 Link Here

(-)ext/oci8/config.m4.orig (+11 lines)
23	if test -s "$OCI8_DIR/orainst/unix.rgs"; then	23	if test -s "$OCI8_DIR/orainst/unix.rgs"; then
24	OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs \| sed 's/[ ][ ]*/:/g' \| cut -d: -f 6 \| cut -c 2-4`	24	OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs \| sed 's/[ ][ ]*/:/g' \| cut -d: -f 6 \| cut -c 2-4`
25	test -z "$OCI8_VERSION" && OCI8_VERSION=7.3	25	test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
		26	elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
		27	OCI8_VERSION=10.1
26	elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then	28	elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
27	OCI8_VERSION=9.0	29	OCI8_VERSION=9.0
28	elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then	30	elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
Lines 115-120 Link Here
115	])	117	])
116	;;	118	;;
117		119
		120
		121
		122	10.1)
		123	PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
		124	PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
		125	AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
		126	AC_DEFINE(HAVE_OCI_9_2,1,[ ])
		127	;;
		128
118	*)	129	*)
119	AC_MSG_ERROR(Unsupported Oracle version!)	130	AC_MSG_ERROR(Unsupported Oracle version!)
120	;;	131	;;




			CALL_OCI_RETURN(connection->error, OCICollAppend(
				  connection->session->pEnv, 
				  connection->pError, 
				  (dvoid *)0,  /* (dword *)0, */
				  &null_ind, 
				  coll->coll));
			if (connection->error) {

				  connection->session->pEnv, 
				  connection->pError, 
				  ndx, 
				  (dvoid *)0, /* (dword *)0, */
				  &null_ind, 
				  coll->coll));
			if (connection->error) {

							connection->session->pEnv, 
							connection->pError, 
							ndx, 
							(dvoid *)&dt, /* (dword *)&dt, */
							&new_ind, 
							coll->coll));


							connection->session->pEnv, 
							connection->pError, 
							ndx, 
							(dvoid *)ocistr, /* (dword *)ocistr, */
							&new_ind, 
							coll->coll));


							connection->session->pEnv, 
							connection->pError, 
							ndx, 
							(dvoid *)&num, /* (dword *)&num,  */
							&new_ind, 
							coll->coll));


Return to bug 42648

Lines 4804-4810 Link Here

(-)ext/oci8/oci8.c.orig (-5 / +5 lines)
4804	CALL_OCI_RETURN(connection->error, OCICollAppend(	4804	CALL_OCI_RETURN(connection->error, OCICollAppend(
4805	connection->session->pEnv,	4805	connection->session->pEnv,
4806	connection->pError,	4806	connection->pError,
4807	(dword *)0,	4807	(dvoid )0, / (dword )0, /
4808	&null_ind,	4808	&null_ind,
4809	coll->coll));	4809	coll->coll));
4810	if (connection->error) {	4810	if (connection->error) {
Lines 5110-5116 Link Here
5110	connection->session->pEnv,	5110	connection->session->pEnv,
5111	connection->pError,	5111	connection->pError,
5112	ndx,	5112	ndx,
5113	(dword *)0,	5113	(dvoid )0, / (dword )0, /
5114	&null_ind,	5114	&null_ind,
5115	coll->coll));	5115	coll->coll));
5116	if (connection->error) {	5116	if (connection->error) {
Lines 5143-5149 Link Here
5143	connection->session->pEnv,	5143	connection->session->pEnv,
5144	connection->pError,	5144	connection->pError,
5145	ndx,	5145	ndx,
5146	(dword *)&dt,	5146	(dvoid )&dt, / (dword )&dt, /
5147	&new_ind,	5147	&new_ind,
5148	coll->coll));	5148	coll->coll));
5149		5149
Lines 5171-5177 Link Here
5171	connection->session->pEnv,	5171	connection->session->pEnv,
5172	connection->pError,	5172	connection->pError,
5173	ndx,	5173	ndx,
5174	(dword *)ocistr,	5174	(dvoid )ocistr, / (dword )ocistr, /
5175	&new_ind,	5175	&new_ind,
5176	coll->coll));	5176	coll->coll));
5177		5177
Lines 5210-5216 Link Here
5210	connection->session->pEnv,	5210	connection->session->pEnv,
5211	connection->pError,	5211	connection->pError,
5212	ndx,	5212	ndx,
5213	(dword *)&num,	5213	(dvoid )&num, / (dword )&num, /
5214	&new_ind,	5214	&new_ind,
5215	coll->coll));	5215	coll->coll));
5216		5216