Browse Source

Fix prototype (may have caused stack corruption)

PHP-5
Zeev Suraski 24 years ago
parent
commit
45c12359a9
  1. 2
      Zend/zend_hash.c
  2. 2
      Zend/zend_hash.h

2
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;

2
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;

Loading…
Cancel
Save