Merge pull request andreiz#38 from sunpoet/master

Timandes · web-flow · commit d113a9c7c960 · 2019-12-11T09:17:20.000+08:00
Fix build with PHP 7.4
diff --git a/php_zookeeper.c b/php_zookeeper.c
@@ -1064,7 +1064,7 @@ static void php_parse_acl_list(zval *z_acl, struct ACL_vector *aclv)
 {
 	int size = 0;
 	int i = 0;
-	ulong index = 0;
+	zend_ulong index = 0;
 	zend_string *key;
 	zval *entry = NULL;
 	zval *perms = NULL;
diff --git a/php_zookeeper_callback.h b/php_zookeeper_callback.h
@@ -24,7 +24,7 @@ typedef struct _php_cb_data_t {
     zend_fcall_info fci;
     zend_fcall_info_cache fcc;
     zend_bool oneshot;
-    ulong h;
+    zend_ulong h;
     HashTable *ht;
 #if ZTS
     void ***ctx;

Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ static void php_parse_acl_list(zval z_acl, struct ACL_vector aclv)`
`1064`	`1064`	`{`
`1065`	`1065`	`int size = 0;`
`1066`	`1066`	`int i = 0;`
`1067`		`- ulong index = 0;`
	`1067`	`+ zend_ulong index = 0;`
`1068`	`1068`	`zend_string *key;`
`1069`	`1069`	`zval *entry = NULL;`
`1070`	`1070`	`zval *perms = NULL;`