From: Zeev Suraski Date: Mon, 20 Aug 2001 14:58:52 +0000 (+0000) Subject: MFZE1 X-Git-Tag: PRE_SUBST_Z_MACROS~421 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b3df86e8db76a9652cf39bc5bcb35e9f8d1f1d4;p=php MFZE1 --- diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 3c24cf4f9f..5bb35d6e52 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1023,7 +1023,7 @@ ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos) /* This function should be made binary safe */ -ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos) +ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos) { Bucket *p; diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 5bcd62d333..62bcab1f9f 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -154,7 +154,7 @@ ZEND_API ulong zend_hash_next_free_element(HashTable *ht); /* traversing */ ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos); ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos); -ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos); +ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos); ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos); ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos); ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos);