diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-02-05 00:41:40 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-02-05 00:41:40 +0000 |
| commit | acc9c13c3615d9dce0df6b99019aeb55e90e5528 (patch) | |
| tree | 0e5cf8633691c5c5108894500ecbd80a22a52d96 /sapi/apache_hooks | |
| parent | ad7facdf2b628ec1e26dff2b4826587c753e005f (diff) | |
| download | php-git-acc9c13c3615d9dce0df6b99019aeb55e90e5528.tar.gz | |
Build Fix.
Diffstat (limited to 'sapi/apache_hooks')
| -rw-r--r-- | sapi/apache_hooks/mod_php4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c index 19eb1dc062..6175514310 100644 --- a/sapi/apache_hooks/mod_php4.c +++ b/sapi/apache_hooks/mod_php4.c @@ -874,7 +874,7 @@ static void *php_merge_dir(pool *p, void *basev, void *addv) php_per_dir_config *a = (php_per_dir_config *) addv; php_per_dir_config *b = (php_per_dir_config *) basev; /* This function *must* return addv, and not modify basev */ - zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *) b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry); + zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *) b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL); a->headers_handlers = (a->headers_handlers.top)?a->headers_handlers:b->headers_handlers; a->auth_handlers = (a->auth_handlers.top)?a->auth_handlers:b->auth_handlers; a->access_handlers = (a->access_handlers.top)?a->access_handlers:b->access_handlers; |