pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compile warning in php 7

pull/83/head
yuqing 2016-12-07 20:04:43 +08:00
parent 81e469b104
commit f1e58515ec
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
php_client/fastdfs_client.c
View File

@ -204,9 +204,10 @@ static int fastdfs_convert_metadata_to_array(zval *metadata_obj, \
unsigned int key_len; unsigned int key_len;
int value_len; int value_len;
HashPosition pointer; HashPosition pointer;
zval ***ppp;
zval **data; zval **data;
#if PHP_MAJOR_VERSION >= 7 #if PHP_MAJOR_VERSION < 7
zval ***ppp;
#else
zval *for_php7; zval *for_php7;
#endif #endif
FDFSMetaData *pMetaData; FDFSMetaData *pMetaData;
@ -232,9 +233,9 @@ static int fastdfs_convert_metadata_to_array(zval *metadata_obj, \
memset(*meta_list, 0, sizeof(FDFSMetaData) * (*meta_count)); memset(*meta_list, 0, sizeof(FDFSMetaData) * (*meta_count));
pMetaData = *meta_list; pMetaData = *meta_list;
ppp = &data;
#if PHP_MAJOR_VERSION < 7 #if PHP_MAJOR_VERSION < 7
ppp = &data;
for (zend_hash_internal_pointer_reset_ex(meta_hash, &pointer); \ for (zend_hash_internal_pointer_reset_ex(meta_hash, &pointer); \
zend_hash_get_current_data_ex(meta_hash, (void **)ppp, &pointer) zend_hash_get_current_data_ex(meta_hash, (void **)ppp, &pointer)
== SUCCESS; zend_hash_move_forward_ex(meta_hash, &pointer)) == SUCCESS; zend_hash_move_forward_ex(meta_hash, &pointer))