*** empty log message ***

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 54c5855b727a8d74ffb44d8050d76f8332a25122..012aa78365e0913e0167ac361c96aecec5f52d17 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1098,9 +1098,8 @@ ZEND_API int zend_hash_get_current_data(HashTable *ht, void **pData)
 }
 
 
-ZEND_API int zend_hash_sort(HashTable *ht,
-                            void (*sort_func)(void *, size_t, size_t, compare_func_t),
-                            compare_func_t compar, int renumber)
+ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func,
+                                                       compare_func_t compar, int renumber)
 {
        Bucket **arTmp;
        Bucket *p;

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index f5fc569f25c757fd1b318141c34d36473010fe71..b0866f4455891dc8c88eef6de98aebad6c6af625 100644 (file)
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -62,7 +62,8 @@ typedef struct hashtable {
        unsigned char persistent;
 } HashTable;
 
-typedef int (*compare_func_t) (const void *, const void *);
+typedef int  (*compare_func_t) (const void *, const void *);
+typedef void (*sort_func_t) (void *, size_t, register size_t, compare_func_t);
 
 BEGIN_EXTERN_C()
 
@@ -155,7 +156,7 @@ ZEND_API void zend_hash_internal_pointer_end(HashTable *ht);
 /* Copying, merging and sorting */
 ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, void (*pCopyConstructor) (void *pData), void *tmp, uint size);
 ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, void (*pCopyConstructor) (void *pData), void *tmp, uint size, int overwrite);
-ZEND_API int zend_hash_sort(HashTable *ht, void (*sort_func)(void *, size_t, size_t, compare_func_t), compare_func_t compar, int renumber);
+ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
 ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar) (const void *, const void *), int flag, void **pData);
 
 ZEND_API int zend_hash_num_elements(HashTable *ht);