From 45c12359a92db3dadebacc1b04d55dcc65e09d90 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Thu, 6 Feb 2003 00:14:49 +0000 Subject: [PATCH] Fix prototype (may have caused stack corruption) --- Zend/zend_hash.c | 2 +- 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 48f2712d0a8..6ec60239ad8 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -816,7 +816,7 @@ ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_fu } -static int zend_hash_replace_checker_wrapper(HashTable *target, void *source_data, Bucket *p, void *pParam, merge_checker_func_t merge_checker_func) +static zend_bool zend_hash_replace_checker_wrapper(HashTable *target, void *source_data, Bucket *p, void *pParam, merge_checker_func_t merge_checker_func) { zend_hash_key hash_key; diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 29f5d21c099..37a84cb9566 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -83,7 +83,7 @@ typedef struct _zend_hash_key { } zend_hash_key; -typedef int (*merge_checker_func_t)(HashTable *target_ht, void *source_data, zend_hash_key *hash_key, void *pParam); +typedef zend_bool (*merge_checker_func_t)(HashTable *target_ht, void *source_data, zend_hash_key *hash_key, void *pParam); typedef Bucket* HashPosition;