4 files changed, 15 insertions, 12 deletions
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index ba384f8cd2..d492f55f7a 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -318,7 +318,7 @@ PHP_FUNCTION(ibase_blob_add)
 PHP_FUNCTION(ibase_blob_get)
 {
 	zval *blob_arg;
-	unsigned long len_arg;
+	zend_ulong len_arg;
 	ibase_blob *ib_blob;
 
 	RESET_ERRMSG;
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index 43fa760833..fce9206dd7 100644
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -1061,7 +1061,8 @@ PHP_FUNCTION(ibase_query)
 {
 	zval *zlink, *ztrans, *bind_args = NULL;
 	char *query;
-	int bind_i, query_len, bind_num;
+	size_t query_len;
+	int bind_i, bind_num;
 	long trans_res_id = 0;
 	ibase_db_link *ib_link = NULL;
 	ibase_trans *trans = NULL;
@@ -1073,7 +1074,7 @@ PHP_FUNCTION(ibase_query)
 	RETVAL_FALSE;
 
 	switch (ZEND_NUM_ARGS()) {
-		long l;
+		zend_long l;
 
 		default:
 		    if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 3, "rrs",
@@ -1472,7 +1473,8 @@ static int _php_ibase_arr_zval(zval *ar_zval, char *data, unsigned long data_siz
 static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type) /* {{{ */
 {
 	zval *result_arg;
-	long i, array_cnt = 0, flag = 0;
+	zend_long flag = 0;
+	long i, array_cnt = 0;
 	ibase_result *ib_result;
 
 	RESET_ERRMSG;
@@ -1684,7 +1686,7 @@ PHP_FUNCTION(ibase_name_result)
 {
 	zval *result_arg;
 	char *name_arg;
-	int name_arg_len;
+	size_t name_arg_len;
 	ibase_result *ib_result;
 
 	RESET_ERRMSG;
@@ -1998,7 +2000,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
 PHP_FUNCTION(ibase_field_info)
 {
 	zval *result_arg;
-	long field_arg;
+	zend_long field_arg;
 	int type;
 	XSQLDA *sqlda;
 
@@ -2062,7 +2064,7 @@ PHP_FUNCTION(ibase_num_params)
 PHP_FUNCTION(ibase_param_info)
 {
 	zval *result_arg;
-	long field_arg;
+	zend_long field_arg;
 	ibase_query *ib_query;
 
 	RESET_ERRMSG;
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index 53795f6668..628d4575f0 100644
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -425,7 +425,7 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
 	zval *res;
 	char *db, *bk, buf[200];
 	size_t dblen, bklen, spb_len;
-	long opts = 0;
+	zend_long opts = 0;
 	zend_bool verbose = 0;
 	ibase_service *svm;
 
@@ -488,8 +488,9 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act
 {
 	zval *res;
 	char buf[128], *db;
-	int dblen, spb_len;
-	long action, argument = 0;
+	size_t dblen;
+	int spb_len;
+	zend_long action, argument = 0;
 	ibase_service *svm;
 
 	RESET_ERRMSG;
@@ -596,7 +597,7 @@ PHP_FUNCTION(ibase_db_info)
 PHP_FUNCTION(ibase_server_info)
 {
 	zval *res;
-	long action;
+	zend_long action;
 	ibase_service *svm;
 
 	RESET_ERRMSG;
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 919ea7de5e..cb6baad658 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -1421,7 +1421,7 @@ PHP_FUNCTION(ibase_gen_id)
 	zval *link = NULL;
 	char query[128], *generator;
 	size_t gen_len;
-	long inc = 1;
+	zend_long inc = 1;
 	ibase_db_link *ib_link;
 	ibase_trans *trans = NULL;
 	XSQLDA out_sqlda;