sixd Fri Jun 6 00:59:45 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8_lob.c Log: (Bugs 41348, 41563, 42456, 42939) Appease the masses and fix compilation with Oracle 8.1. This gives cleaner support for older releases now that PHP 5.3 is firmly Oracle 9.2+ only. No plans to MTH. http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.18&r2=1.7.2.6.2.19&diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.18 php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.19 --- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.18 Mon Feb 25 23:52:10 2008 +++ php-src/ext/oci8/oci8_lob.c Fri Jun 6 00:59:44 2008 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_lob.c,v 1.7.2.6.2.18 2008/02/25 23:52:10 sixd Exp $ */ +/* $Id: oci8_lob.c,v 1.7.2.6.2.19 2008/06/06 00:59:44 sixd Exp $ */ @@ -302,6 +302,7 @@ } if (is_clob) { +#ifdef OCI_NLS_CHARSET_MAXBYTESZ PHP_OCI_CALL_RETURN(connection->errcode, OCINlsNumericInfoGet, (connection->env, connection->err, &bytes_per_char, OCI_NLS_CHARSET_MAXBYTESZ)); if (connection->errcode != OCI_SUCCESS) { @@ -309,6 +310,10 @@ PHP_OCI_HANDLE_ERROR(connection, connection->errcode); return 1; } +#else + /* Oracle 8.1 doesn't define OCI_NLS_CHARSET_MAXBYTESZ, so allocate worst case size */ + bytes_per_char = 4; +#endif } else { /* BLOBs don't have encoding, so bytes_per_char == 1 */ }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php