(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.

diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c
index d498ded32e9fc484150376459cdab1e30809122f..9aef7f5fa479de474ea7c1ba338003f66fc9c139 100644 (file)
--- a/ext/oci8/oci8_lob.c
+++ b/ext/oci8/oci8_lob.c
@@ -302,6 +302,7 @@ int php_oci_lob_read (php_oci_descriptor *descriptor, long read_length, long ini
        }
 
        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 @@ int php_oci_lob_read (php_oci_descriptor *descriptor, long read_length, long ini
                        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 */
        }