diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-02-04 20:54:17 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-02-04 20:54:17 +0000 |
| commit | 13f8b211c417574d3e4f1f54d8a5a37b15e2a66b (patch) | |
| tree | 401cdc9b9e41b241ad3373b6de678600029fa0ec /sapi/apache_hooks/mod_php4.c | |
| parent | afc673b61d845567b4ca112fc07999ad57c6f095 (diff) | |
| download | php-git-13f8b211c417574d3e4f1f54d8a5a37b15e2a66b.tar.gz | |
Fixed compilation of Apache & Apache Hooks SAPIs.
Diffstat (limited to 'sapi/apache_hooks/mod_php4.c')
| -rw-r--r-- | sapi/apache_hooks/mod_php4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c index f5d71ca7ce..19eb1dc062 100644 --- a/sapi/apache_hooks/mod_php4.c +++ b/sapi/apache_hooks/mod_php4.c @@ -783,12 +783,11 @@ static void copy_per_dir_entry(php_per_dir_entry *per_dir_entry) } /* }}} */ -/* {{{ should_overwrite_per_dir_entry +/* {{{ should_overwrite_per_dir_entry; */ static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData) { - php_per_dir_entry *orig_per_dir_entry; php_per_dir_entry *new_per_dir_entry; if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **) &new_per_dir_entry)==FAILURE) { @@ -875,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), (replace_checker_func_t) should_overwrite_per_dir_entry, NULL); + 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); 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; |