diff options
author | Zeev Suraski <zeev@php.net> | 2003-02-04 12:12:34 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 2003-02-04 12:12:34 +0000 |
commit | 471947b1885b82f82ba9c338731979c5cc952aec (patch) | |
tree | 1711df79a216628d53d65348f9067bb07f372ce9 /Zend/zend_ts_hash.h | |
parent | be3908cc8e6e3616b3f2dd5cf11479390cad917b (diff) | |
download | php-git-471947b1885b82f82ba9c338731979c5cc952aec.tar.gz |
Reimplement PPP properties
Diffstat (limited to 'Zend/zend_ts_hash.h')
-rw-r--r-- | Zend/zend_ts_hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 3cd316ff1b..736d214f88 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -92,7 +92,7 @@ ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, ulong h); /* Copying, merging and sorting */ ZEND_API void zend_ts_hash_copy(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); ZEND_API void zend_ts_hash_merge(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite); -ZEND_API void zend_ts_hash_merge_ex(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *p_new)); +ZEND_API void zend_ts_hash_merge_ex(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, uint size, merge_checker_func_t pMergeSource, void *pParam); ZEND_API int zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber TSRMLS_DC); ZEND_API int zend_ts_hash_compare(TsHashTable *ht1, TsHashTable *ht2, compare_func_t compar, zend_bool ordered TSRMLS_DC); ZEND_API int zend_ts_hash_minmax(TsHashTable *ht, compare_func_t compar, int flag, void **pData TSRMLS_DC); |