Skip to content

P
protobuf
Unverified Commit c5eada8e authored by Luca Santarella's avatar Luca Santarella Committed by GitHub
Browse files
Options

Refactored ulong to zend_ulong for php7.4 compatibility (#7147)

parent 85219578
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
php/ext/google/protobuf/protobuf.h
View file @ c5eada8e
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
#define PHP_PROTO_HASH_OF(array) Z_ARRVAL_P(&array) #define PHP_PROTO_HASH_OF(array) Z_ARRVAL_P(&array)
static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, ulong h, static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, zend_ulong h,
zval* pData) { zval* pData) {
void* result = NULL; void* result = NULL;
result = zend_hash_index_update(ht, h, pData); result = zend_hash_index_update(ht, h, pData);
...@@ -308,7 +308,7 @@ static inline int php_proto_zend_hash_update(HashTable* ht, const char* key, ...@@ -308,7 +308,7 @@ static inline int php_proto_zend_hash_update(HashTable* ht, const char* key,
return result != NULL ? SUCCESS : FAILURE; return result != NULL ? SUCCESS : FAILURE;
} }
static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, ulong h, static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, zend_ulong h,
void* pData, uint nDataSize, void* pData, uint nDataSize,
void** pDest) { void** pDest) {
void* result = NULL; void* result = NULL;
...@@ -337,7 +337,7 @@ static inline int php_proto_zend_hash_update_mem(HashTable* ht, const char* key, ...@@ -337,7 +337,7 @@ static inline int php_proto_zend_hash_update_mem(HashTable* ht, const char* key,
} }
static inline int php_proto_zend_hash_index_find_zval(const HashTable* ht, static inline int php_proto_zend_hash_index_find_zval(const HashTable* ht,
ulong h, void** pDest) { zend_ulong h, void** pDest) {
zval* result = zend_hash_index_find(ht, h); zval* result = zend_hash_index_find(ht, h);
if (pDest != NULL) *pDest = result; if (pDest != NULL) *pDest = result;
return result != NULL ? SUCCESS : FAILURE; return result != NULL ? SUCCESS : FAILURE;
...@@ -351,7 +351,7 @@ static inline int php_proto_zend_hash_find(const HashTable* ht, const char* key, ...@@ -351,7 +351,7 @@ static inline int php_proto_zend_hash_find(const HashTable* ht, const char* key,
} }
static inline int php_proto_zend_hash_index_find_mem(const HashTable* ht, static inline int php_proto_zend_hash_index_find_mem(const HashTable* ht,
ulong h, void** pDest) { zend_ulong h, void** pDest) {
void* result = NULL; void* result = NULL;
result = zend_hash_index_find_ptr(ht, h); result = zend_hash_index_find_ptr(ht, h);
if (pDest != NULL) *pDest = result; if (pDest != NULL) *pDest = result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment