summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>1999-10-15 20:37:53 +0000
committerAndrei Zmievski <andrei@php.net>1999-10-15 20:37:53 +0000
commite956a266e2c49cf5c752555636e2155b7a8e2b00 (patch)
tree69444dc10b15217301868b63641708824efdfac9
parentce1f3a7d83d398c4c073e610f9ead4aaff1ae66f (diff)
downloadphp-git-e956a266e2c49cf5c752555636e2155b7a8e2b00.tar.gz
*** empty log message ***
-rw-r--r--Zend/zend_hash.c5
-rw-r--r--Zend/zend_hash.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 54c5855b72..012aa78365 100644
--- 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 f5fc569f25..b0866f4455 100644
--- 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);