the last 64bit fix

diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c
index 35a50c21fcbf71ad8157197efd106f273593b9e3..9080ddd203184cd692e1639ad1133c232684a63c 100644 (file)
--- a/ext/oci8/oci8_collection.c
+++ b/ext/oci8/oci8_collection.c
@@ -44,7 +44,7 @@
 
 /* {{{ php_oci_collection_create() 
  Create and return connection handle */
-php_oci_collection * php_oci_collection_create(php_oci_connection* connection, char *tdo, long tdo_len, char *schema, long schema_len TSRMLS_DC)
+php_oci_collection * php_oci_collection_create(php_oci_connection* connection, char *tdo, int tdo_len, char *schema, int schema_len TSRMLS_DC)
 {      
        dvoid *dschp1;
        dvoid *parmp1;
@@ -218,7 +218,7 @@ int php_oci_collection_append_null(php_oci_collection *collection TSRMLS_DC)
 
 /* {{{ php_oci_collection_append_date() 
  Append DATE element to the end of the collection (use "DD-MON-YY" format) */
-int php_oci_collection_append_date(php_oci_collection *collection, char *date, long date_len TSRMLS_DC)
+int php_oci_collection_append_date(php_oci_collection *collection, char *date, int date_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        OCIDate oci_date;
@@ -245,7 +245,7 @@ int php_oci_collection_append_date(php_oci_collection *collection, char *date, l
 
 /* {{{ php_oci_collection_append_number()
  Append NUMBER to the end of the collection */
-int php_oci_collection_append_number(php_oci_collection *collection, char *number, long number_len TSRMLS_DC)
+int php_oci_collection_append_number(php_oci_collection *collection, char *number, int number_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        double element_double;
@@ -273,7 +273,7 @@ int php_oci_collection_append_number(php_oci_collection *collection, char *numbe
 
 /* {{{ php_oci_collection_append_string() 
  Append STRING to the end of the collection */
-int php_oci_collection_append_string(php_oci_collection *collection, char *element, long element_len TSRMLS_DC)
+int php_oci_collection_append_string(php_oci_collection *collection, char *element, int element_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        OCIString *ocistr = (OCIString *)0;
@@ -298,7 +298,7 @@ int php_oci_collection_append_string(php_oci_collection *collection, char *eleme
 
 /* {{{ php_oci_collection_append() 
  Append wrapper. Appends any supported element to the end of the collection */
-int php_oci_collection_append(php_oci_collection *collection, char *element, long element_len TSRMLS_DC)
+int php_oci_collection_append(php_oci_collection *collection, char *element, int element_len TSRMLS_DC)
 {
        if (element_len == 0) {
                return php_oci_collection_append_null(collection TSRMLS_CC);
@@ -455,7 +455,7 @@ int php_oci_collection_element_set_null(php_oci_collection *collection, long ind
 
 /* {{{ php_oci_collection_element_set_date() 
  Change element's value to the given DATE */
-int php_oci_collection_element_set_date(php_oci_collection *collection, long index, char *date, long date_len TSRMLS_DC)
+int php_oci_collection_element_set_date(php_oci_collection *collection, long index, char *date, int date_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        OCIDate oci_date;
@@ -482,7 +482,7 @@ int php_oci_collection_element_set_date(php_oci_collection *collection, long ind
 
 /* {{{ php_oci_collection_element_set_number()
  Change element's value to the given NUMBER */
-int php_oci_collection_element_set_number(php_oci_collection *collection, long index, char *number, long number_len TSRMLS_DC)
+int php_oci_collection_element_set_number(php_oci_collection *collection, long index, char *number, int number_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        double element_double;
@@ -510,7 +510,7 @@ int php_oci_collection_element_set_number(php_oci_collection *collection, long i
 
 /* {{{ php_oci_collection_element_set_string()
  Change element's value to the given string */
-int php_oci_collection_element_set_string(php_oci_collection *collection, long index, char *element, long element_len TSRMLS_DC)
+int php_oci_collection_element_set_string(php_oci_collection *collection, long index, char *element, int element_len TSRMLS_DC)
 {
        OCIInd new_index = OCI_IND_NOTNULL;
        OCIString *ocistr = (OCIString *)0;
@@ -535,7 +535,7 @@ int php_oci_collection_element_set_string(php_oci_collection *collection, long i
 
 /* {{{ php_oci_collection_element_set()
  Collection element setter */
-int php_oci_collection_element_set(php_oci_collection *collection, long index, char *value, long value_len TSRMLS_DC)
+int php_oci_collection_element_set(php_oci_collection *collection, long index, char *value, int value_len TSRMLS_DC)
 {
        if (value_len == 0) {
                return php_oci_collection_element_set_null(collection, index TSRMLS_CC);

diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index 5cfbeaa02c61f49918ab8b38464282a856a11acf..a2aae2f6ef16a51f40390b08f2aa6a7b790d6d08 100644 (file)
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -656,7 +656,7 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC)
 
 /* {{{ php_oci_bind_by_name() 
  Bind zval to the given placeholder */
-int php_oci_bind_by_name(php_oci_statement *statement, char *name, long name_len, zval* var, long maxlength, long type TSRMLS_DC)
+int php_oci_bind_by_name(php_oci_statement *statement, char *name, int name_len, zval* var, long maxlength, long type TSRMLS_DC)
 {
        php_oci_collection *bind_collection = NULL;
        php_oci_descriptor *bind_descriptor = NULL;

diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index d23c75a688acd4c9e7f72a4a66de06de5b51a0b6..18a613f10dd78f4d47463b5a2b49188b3627b4c6 100644 (file)
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -312,23 +312,23 @@ int php_oci_lob_is_equal (php_oci_descriptor *, php_oci_descriptor *, boolean *
 
 /* collection related prototypes {{{ */
 
-php_oci_collection * php_oci_collection_create(php_oci_connection *, char *, long, char *, long TSRMLS_DC);
+php_oci_collection * php_oci_collection_create(php_oci_connection *, char *, int, char *, int TSRMLS_DC);
 int php_oci_collection_size(php_oci_collection *, sb4 * TSRMLS_DC);
 int php_oci_collection_max(php_oci_collection *, long * TSRMLS_DC);
 int php_oci_collection_trim(php_oci_collection *, long TSRMLS_DC);
-int php_oci_collection_append(php_oci_collection *, char *, long TSRMLS_DC);
+int php_oci_collection_append(php_oci_collection *, char *, int TSRMLS_DC);
 int php_oci_collection_element_get(php_oci_collection *, long, zval** TSRMLS_DC);
-int php_oci_collection_element_set(php_oci_collection *, long, char*, long TSRMLS_DC);
+int php_oci_collection_element_set(php_oci_collection *, long, char*, int TSRMLS_DC);
 int php_oci_collection_element_set_null(php_oci_collection *, long TSRMLS_DC);
-int php_oci_collection_element_set_date(php_oci_collection *, long, char *, long TSRMLS_DC);
-int php_oci_collection_element_set_number(php_oci_collection *, long, char *, long TSRMLS_DC);
-int php_oci_collection_element_set_string(php_oci_collection *, long, char *, long TSRMLS_DC);
+int php_oci_collection_element_set_date(php_oci_collection *, long, char *, int TSRMLS_DC);
+int php_oci_collection_element_set_number(php_oci_collection *, long, char *, int TSRMLS_DC);
+int php_oci_collection_element_set_string(php_oci_collection *, long, char *, int TSRMLS_DC);
 int php_oci_collection_assign(php_oci_collection *, php_oci_collection * TSRMLS_DC);
 void php_oci_collection_close(php_oci_collection * TSRMLS_DC);
 int php_oci_collection_append_null(php_oci_collection * TSRMLS_DC);
-int php_oci_collection_append_date(php_oci_collection *, char *, long TSRMLS_DC);
-int php_oci_collection_append_number(php_oci_collection *, char *, long TSRMLS_DC);
-int php_oci_collection_append_string(php_oci_collection *, char *, long TSRMLS_DC);
+int php_oci_collection_append_date(php_oci_collection *, char *, int TSRMLS_DC);
+int php_oci_collection_append_number(php_oci_collection *, char *, int TSRMLS_DC);
+int php_oci_collection_append_string(php_oci_collection *, char *, int TSRMLS_DC);
 
 
 /* }}} */
@@ -344,7 +344,7 @@ int php_oci_statement_cancel (php_oci_statement * TSRMLS_DC);
 void php_oci_statement_free (php_oci_statement * TSRMLS_DC);
 int php_oci_bind_pre_exec(void *data TSRMLS_DC);
 int php_oci_bind_post_exec(void *data TSRMLS_DC);
-int php_oci_bind_by_name(php_oci_statement *, char *, long, zval*, long, long TSRMLS_DC);
+int php_oci_bind_by_name(php_oci_statement *, char *, int, zval*, long, long TSRMLS_DC);
 sb4 php_oci_bind_in_callback(dvoid *, OCIBind *, ub4, ub4, dvoid **, ub4 *, ub1 *, dvoid **);
 sb4 php_oci_bind_out_callback(dvoid *, OCIBind *, ub4, ub4, dvoid **, ub4 **, ub1 *, dvoid **, ub2 **);
 php_oci_out_column *php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAMETERS);