cvs: php4 /ext/oci8 config.m4 oci8.c

edink Tue Aug 20 03:26:50 2002 EDT Modified files: /php4/ext/oci8 config.m4 oci8.c Log: Fixed build with Oracle 8.0.x (bug #18973). Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.34 php4/ext/oci8/config.m4:1.35 --- php4/ext/oci8/config.m4:1.34 Tue Mar 12 11:26:00 2002 +++ php4/ext/oci8/config.m4 Tue Aug 20 03:26:50 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.34 2002/03/12 16:26:00 sas Exp $ +dnl $Id: config.m4,v 1.35 2002/08/20 07:26:50 edink Exp $ dnl AC_DEFUN(AC_OCI8_VERSION,[ @@ -70,6 +70,7 @@ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) + AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) ;; *) Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.174 php4/ext/oci8/oci8.c:1.175 --- php4/ext/oci8/oci8.c:1.174 Tue Aug 13 01:00:11 2002 +++ php4/ext/oci8/oci8.c Tue Aug 20 03:26:50 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.174 2002/08/13 05:00:11 rasmus Exp $ */ +/* $Id: oci8.c,v 1.175 2002/08/20 07:26:50 edink Exp $ */ /* TODO list: * @@ -631,7 +631,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.174 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.175 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -4231,8 +4231,10 @@ sb4 errcode = 0; sword error = 0; dvoid *errh = NULL; +#ifdef HAVE_OCI8_ATTR_STATEMENT ub2 errorofs = 0; text *sqltext = NULL; +#endif if (zend_get_parameters_ex(1, &arg) == SUCCESS) { statement = (oci_statement *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_stmt); @@ -4240,6 +4242,7 @@ errh = statement->pError; error = statement->error; +#ifdef HAVE_OCI8_ATTR_STATEMENT CALL_OCI_RETURN(statement->error, OCIAttrGet( (dvoid *)statement->pStmt, OCI_HTYPE_STMT, @@ -4255,6 +4258,7 @@ (ub4 *)0, OCI_ATTR_PARSE_ERROR_OFFSET, statement->pError)); +#endif } else { connection = (oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_conn); @@ -4290,8 +4294,10 @@ array_init(return_value); add_assoc_long(return_value, "code", errcode); add_assoc_string(return_value, "message", (char*) errbuf, 1); +#ifdef HAVE_OCI8_ATTR_STATEMENT add_assoc_long(return_value, "offset", errorofs); add_assoc_string(return_value, "sqltext", sqltext ? (char *) sqltext : "", 1); +#endif } else { RETURN_FALSE; }