Skip to content

Commit f6f0d91

Browse files
committed
Fix build with PHP 7.4
Build error on FreeBSD with PHP 7.4 RC6: --- php_zookeeper_session.lo --- /bin/sh /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/libtool --mode=compile cc -I/usr/local/include/php -I. -I/wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1 -DPHP_ATOM_INC -I/wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/include -I/wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/main -I/wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1 -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -I/usr/local/include/zookeeper -DHAVE_CONFIG_H -O2 -pipe -fstack-protector -fno-strict-aliasing -c /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper_session.c -o php_zookeeper_session.loict-aliasing -c /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper_session.c -fPIC -DPIC -o .libs/php_zookeeper_session.o ./php_zookeeper_callback.h:27:5: error: unknown type name 'ulong' ulong h; ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1071:7: error: expected ';' after expression ulong index = 0; ^ ; /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1071:2: error: use of undeclared identifier 'ulong' ulong index = 0; ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1071:14: error: non-object type 'char *(const char *, int)' is not assignable ulong index = 0; ~~~~~ ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1084:2: error: non-object type 'char *(const char *, int)' is not assignable ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(z_acl), index, key, entry) { ^ ~~~~~ /usr/local/include/php/Zend/zend_hash.h:1005:5: note: expanded from macro 'ZEND_HASH_FOREACH_KEY_VAL' _h = _p->h; \ ~~ ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1544:44: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] snprintf(buf, sizeof(buf), "%ld.%ld.%ld", ZOO_MAJOR_VERSION, ZOO_MINOR_VERSION, ZOO_PATCH_VERSION); ~~~ ^~~~~~~~~~~~~~~~~ %d /usr/local/include/zookeeper/zookeeper_version.h:25:27: note: expanded from macro 'ZOO_MAJOR_VERSION' #define ZOO_MAJOR_VERSION 3 ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1544:63: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] snprintf(buf, sizeof(buf), "%ld.%ld.%ld", ZOO_MAJOR_VERSION, ZOO_MINOR_VERSION, ZOO_PATCH_VERSION); ~~~ ^~~~~~~~~~~~~~~~~ %d /usr/local/include/zookeeper/zookeeper_version.h:26:27: note: expanded from macro 'ZOO_MINOR_VERSION' #define ZOO_MINOR_VERSION 5 ^ /wrkdirs/usr/ports/devel/pecl-zookeeper/work-php74/zookeeper-0.7.1/php_zookeeper.c:1544:82: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] snprintf(buf, sizeof(buf), "%ld.%ld.%ld", ZOO_MAJOR_VERSION, ZOO_MINOR_VERSION, ZOO_PATCH_VERSION); ~~~ ^~~~~~~~~~~~~~~~~ %d /usr/local/include/zookeeper/zookeeper_version.h:27:27: note: expanded from macro 'ZOO_PATCH_VERSION' #define ZOO_PATCH_VERSION 5 ^ 3 warnings and 5 errors generated. *** [php_zookeeper.lo] Error code 1
1 parent 4993480 commit f6f0d91

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

php_zookeeper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ static void php_parse_acl_list(zval *z_acl, struct ACL_vector *aclv)
10641064
{
10651065
int size = 0;
10661066
int i = 0;
1067-
ulong index = 0;
1067+
zend_ulong index = 0;
10681068
zend_string *key;
10691069
zval *entry = NULL;
10701070
zval *perms = NULL;

php_zookeeper_callback.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct _php_cb_data_t {
2424
zend_fcall_info fci;
2525
zend_fcall_info_cache fcc;
2626
zend_bool oneshot;
27-
ulong h;
27+
zend_ulong h;
2828
HashTable *ht;
2929
#if ZTS
3030
void ***ctx;

0 commit comments

Comments
 (0)