# make sebastian and compiler happy .)

diff --git a/main/php_ini.c b/main/php_ini.c
index a64033f2f132450a861346d59fea5f836ac7c2be..3925b315927c2256335e197e35ed36667a0ab4f2 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -121,8 +121,9 @@ static void pvalue_config_destructor(zval *pvalue)
     }
 }
 
-static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, php_extension_lists *extension_lists)
+static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg_list)
 {
+       php_extension_lists *extension_lists =(php_extension_lists * )arg_list;
        switch (callback_type) {
                case ZEND_INI_PARSER_ENTRY: {
                                zval *entry;
@@ -163,6 +164,7 @@ static void php_startup_loaded_extension_cb(void *arg){
 int php_startup_loaded_extensions(void)
 {
        zend_llist_apply(php_load_extension_list, php_startup_loaded_extension_cb);
+       return SUCCESS;
 }
 
 static void php_load_function_extension_cb(void *arg)
@@ -171,7 +173,7 @@ static void php_load_function_extension_cb(void *arg)
 
        if(! php_load_extension_list) {
                php_load_extension_list=(zend_llist*)malloc(sizeof(zend_llist));
-               zend_llist_init(php_load_extension_list, sizeof(char **), free_estring, 1);
+               zend_llist_init(php_load_extension_list, sizeof(char **), (void(*)(void *))free_estring, 1);
        }
 
        zend_llist_add_element(php_load_extension_list, &extension);
@@ -207,8 +209,8 @@ int php_init_config(char *php_ini_path_override)
                 be loaded in linked lists and process theese immediately 
                 *after* we have finished setting up the ini mechanism
                 */
-       zend_llist_init(&extension_lists.engine   , sizeof(char **), free_estring, 1);
-       zend_llist_init(&extension_lists.functions, sizeof(char **), free_estring, 1);
+       zend_llist_init(&extension_lists.engine   , sizeof(char **), (void(*)(void *))free_estring, 1);
+       zend_llist_init(&extension_lists.functions, sizeof(char **), (void(*)(void *))free_estring, 1);
        
        safe_mode_state = PG(safe_mode);
        open_basedir = PG(open_basedir);

diff --git a/main/php_ini.h b/main/php_ini.h
index 5b5bb94eac93658888c63305d2576304b5f9f3ff..a2330910a65c1140cdc27961f8d75c5289ccfd77 100644 (file)
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -23,6 +23,7 @@
 
 int php_init_config(char *php_ini_path_override);
 int php_shutdown_config(void);
+int php_startup_loaded_extensions(void);
 zval *cfg_get_entry(char *name, uint name_length);
 
 #define PHP_INI_USER   ZEND_INI_USER