diff options
author | Dmitry Stogov <dmitry@php.net> | 2005-07-07 15:16:57 +0000 |
---|---|---|
committer | Dmitry Stogov <dmitry@php.net> | 2005-07-07 15:16:57 +0000 |
commit | d9c1a380ad0b073c8750f130a412229aeaed9a1b (patch) | |
tree | c4df575424a1d4ebe3413ca22dbd4193d02eb62e /Zend/zend_hash.h | |
parent | 3c5b9a6e6a1cb7462c5e2ffec23bea34f29a18dd (diff) | |
download | php-git-d9c1a380ad0b073c8750f130a412229aeaed9a1b.tar.gz |
Fixed bug #28072 (static array with some constant keys will be incorrectly ordered).
Diffstat (limited to 'Zend/zend_hash.h')
-rw-r--r-- | Zend/zend_hash.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 0b6dbb8288..292f9747f4 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -174,6 +174,7 @@ 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); ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos); +ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, char *str_index, uint str_length, ulong num_index, HashPosition *pos); #define zend_hash_has_more_elements(ht) \ zend_hash_has_more_elements_ex(ht, NULL) @@ -191,6 +192,8 @@ ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos zend_hash_internal_pointer_reset_ex(ht, NULL) #define zend_hash_internal_pointer_end(ht) \ zend_hash_internal_pointer_end_ex(ht, NULL) +#define zend_hash_update_current_key(ht, key_type, str_index, str_length, num_index) \ + zend_hash_update_current_key_ex(ht, key_type, str_index, str_length, num_index, NULL) /* Copying, merging and sorting */ ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); |