Fixed compilation of Apache & Apache Hooks SAPIs.

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 1514db72d6c6fcbcbc6ad9264946627b5bf17ceb..a2447800d2276b9a956deb98f04dda86facf3fea 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -674,7 +674,6 @@ static void copy_per_dir_entry(php_per_dir_entry *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) {
@@ -718,7 +717,7 @@ static void *php_create_dir(pool *p, char *dummy)
 static void *php_merge_dir(pool *p, void *basev, void *addv)
 {
        /* This function *must* return addv, and not modify basev */
-       zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+       zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
        return addv;
 }
 /* }}} */

diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c
index f5d71ca7ce1593bbd540412573a48ecf55123ba4..19eb1dc062fabb7129163cac130ebe36180914c1 100644 (file)
--- 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;