Merge branch 'v1.0.x'

[m6w6/ext-pq] / src / php_pqres.c

diff --git a/src/php_pqres.c b/src/php_pqres.c
index f2ddf98029497a7d9314a1f82bde1d4a009f8cac..1bc0d1d11ce5ad5446f99a84e3123f75b72049c3 100644 (file)
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -145,7 +145,7 @@ zval *php_pqres_typed_zval(php_pqres_t *res, Oid typ, zval *zv)
                        goto noconversion;
                }
                {
-                       long lval;
+                       zend_long lval;
                        double dval;
 
                        switch (is_numeric_str_function(str, &lval, &dval)) {
@@ -374,7 +374,7 @@ static ZEND_RESULT_CODE php_pqres_count_elements(zval *object, long *count)
        }
 }
 
-ZEND_RESULT_CODE php_pqres_success(PGresult *res TSRMLS_DC)
+ZEND_RESULT_CODE php_pqres_success(PGresult *res)
 {
        zval zexc;
 
@@ -529,7 +529,7 @@ static void php_pqres_object_write_auto_conv(zval *object, void *o, zval *value)
        obj->intern->auto_convert = zval_get_long(value);
 }
 
-static ZEND_RESULT_CODE php_pqres_iteration(zval *zobj, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type, zval *row TSRMLS_DC)
+static ZEND_RESULT_CODE php_pqres_iteration(zval *zobj, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type, zval *row)
 {
        ZEND_RESULT_CODE rv;
        php_pqres_fetch_t orig_fetch;
@@ -561,7 +561,7 @@ typedef struct php_pqres_col {
 
 static ZEND_RESULT_CODE column_nn(php_pqres_object_t *obj, zval *zcol, php_pqres_col_t *col)
 {
-       long index = -1;
+       zend_long index = -1;
        char *name = NULL;
 
        if (!zcol) {