Skip to content

Fixed build with PHP-7.4 #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m6w6 merged 1 commit into from
Dec 18, 2019
Merged

Fixed build with PHP-7.4 #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions msgpack_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#include "msgpack_convert.h"
#include "msgpack_errors.h"

static inline int msgpack_convert_long_to_properties(HashTable *ht, zval *object, HashTable **properties, HashPosition *prop_pos, uint key_index, zval *val, HashTable *var) /* {{{ */ {
static inline int msgpack_convert_long_to_properties(HashTable *ht, zval *object, HashTable **properties, HashPosition *prop_pos, unsigned int key_index, zval *val, HashTable *var) /* {{{ */ {
zval key_zv;
HashTable *props = *properties;

if (props != NULL) {
zval *data, tplval, *dataval, prop_key_zv;
zend_string *prop_key;
ulong prop_key_index;
zend_ulong prop_key_index;
const char *class_name, *prop_name;
size_t prop_len;

Expand Down Expand Up @@ -102,7 +102,7 @@ static inline int msgpack_convert_string_to_properties(zval *object, zend_string
int msgpack_convert_array(zval *return_value, zval *tpl, zval *value) /* {{{ */ {
zend_string *key;
int key_type;
ulong key_index;
zend_ulong key_index;
zval *data;
HashTable *ht, *htval;

Expand Down Expand Up @@ -329,7 +329,7 @@ int msgpack_convert_object(zval *return_value, zval *tpl, zval *value) /* {{{ */
HashTable *ht, *ret, *var = NULL;
zend_string *str_key;
zval *data;
ulong num_key;
zend_ulong num_key;

ht = HASH_OF(value);
ret = HASH_OF(return_value);
Expand Down