fix #39732 (oci_bind_array_by_name doesn't work on Solaris 64bit)

diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c
index 4e96ee3c6a638612f0a51dd1519f8f861b95a811..f38dd8d8c4028dc6d1fdc889f8b9d6a4b7c0ec16 100644 (file)
--- a/ext/oci8/oci8_lob.c
+++ b/ext/oci8/oci8_lob.c
@@ -500,7 +500,7 @@ int php_oci_lob_get_buffering (php_oci_descriptor *descriptor)
 int php_oci_lob_copy (php_oci_descriptor *descriptor_dest, php_oci_descriptor *descriptor_from, long length TSRMLS_DC)
 {
        php_oci_connection *connection = descriptor_dest->connection;
-       int length_dest, length_from, copy_len;
+       ub4 length_dest, length_from, copy_len;
        
        if (php_oci_lob_get_length(descriptor_dest, &length_dest TSRMLS_CC)) {
                return 1;
@@ -767,7 +767,7 @@ int php_oci_lob_truncate (php_oci_descriptor *descriptor, long new_lob_length TS
 
 /* {{{ php_oci_lob_erase()
  Erase (or fill with whitespaces, depending on LOB type) the LOB (or its part) */
-int php_oci_lob_erase (php_oci_descriptor *descriptor, long offset, long length, ub4 *bytes_erased TSRMLS_DC)
+int php_oci_lob_erase (php_oci_descriptor *descriptor, long offset, ub4 length, ub4 *bytes_erased TSRMLS_DC)
 {
        php_oci_connection *connection = descriptor->connection;
        OCILobLocator *lob = descriptor->descriptor;

diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index 673db73e51313d03752957e031fa6fae063211c1..b919618af1e00310c2f75c346bc9aff5cf580eb7 100644 (file)
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -191,9 +191,9 @@ typedef struct { /* php_oci_bind {{{ */
 /*             ub2 *indicators; */
                ub2 *element_lengths;
 /*             ub2 *retcodes;          */
-               long current_length;
-               long old_length;
-               long max_length;
+               ub4 current_length;
+               ub4 old_length;
+               ub4 max_length;
                long type;
        } array;
        sb2 indicator;                  /* -1 means NULL */
@@ -347,7 +347,7 @@ void php_oci_lob_free(php_oci_descriptor * TSRMLS_DC);
 int php_oci_lob_import(php_oci_descriptor *descriptor, char * TSRMLS_DC);
 int php_oci_lob_append (php_oci_descriptor *, php_oci_descriptor * TSRMLS_DC);
 int php_oci_lob_truncate (php_oci_descriptor *, long TSRMLS_DC);
-int php_oci_lob_erase (php_oci_descriptor *, long, long, ub4 * TSRMLS_DC);
+int php_oci_lob_erase (php_oci_descriptor *, long, ub4, ub4 * TSRMLS_DC);
 int php_oci_lob_is_equal (php_oci_descriptor *, php_oci_descriptor *, boolean * TSRMLS_DC);
 #if defined(HAVE_OCI_LOB_READ2)
 sb4 php_oci_lob_callback (dvoid *ctxp, CONST dvoid *bufxp, oraub8 len, ub1 piece, dvoid **changed_bufpp, oraub8 *changed_lenp);