summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2003-02-06 00:14:49 +0000
committerZeev Suraski <zeev@php.net>2003-02-06 00:14:49 +0000
commit45c12359a92db3dadebacc1b04d55dcc65e09d90 (patch)
tree3617716ffe5144088e19008cb29f9d9cee8ffb22
parent984cde31238e45dfc28ba21553802d297e3eb121 (diff)
downloadphp-git-45c12359a92db3dadebacc1b04d55dcc65e09d90.tar.gz
Fix prototype (may have caused stack corruption)
-rw-r--r--Zend/zend_hash.c2
-rw-r--r--Zend/zend_hash.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 48f2712d0a..6ec60239ad 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 29f5d21c09..37a84cb956 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;