diff options
author | Andi Gutmans <andi@php.net> | 2000-10-11 19:11:48 +0000 |
---|---|---|
committer | Andi Gutmans <andi@php.net> | 2000-10-11 19:11:48 +0000 |
commit | e9887156cf52b1ba8fa1f9ec440f8dda3913ac7a (patch) | |
tree | d9ef9c9a98b243473464271319cdf6aa36c3b005 | |
parent | 0b1b5e30800b33ad4ce99ae534ee81477c5a2493 (diff) | |
download | php-git-e9887156cf52b1ba8fa1f9ec440f8dda3913ac7a.tar.gz |
Don't use 'new' symbol
-rw-r--r-- | Zend/zend_hash.c | 2 | ||||
-rw-r--r-- | Zend/zend_hash.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index f2ae8c46f8..4d258b7759 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -797,7 +797,7 @@ ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_fu } -ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *new)) +ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *p_new)) { Bucket *p; void *t; diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 37e20457a0..85abe7ff61 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -170,7 +170,7 @@ ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos /* Copying, merging and sorting */ ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite); -ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *new)); +ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *p_new)); 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_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered); ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar)(const void *, const void *), int flag, void **pData); |