[PHP-CVS] cvs: php4 /main php_ini.c php_ini.h

[Hartmut Holzgraefe]

hholzgra                Wed Feb 21 03:16:16 2001 EDT

  Modified files:              
    /php4/main  php_ini.c php_ini.h 
  Log:
  # make sebastian and compiler happy .)
  
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.50 php4/main/php_ini.c:1.51
--- php4/main/php_ini.c:1.50    Tue Feb 20 17:43:15 2001
+++ php4/main/php_ini.c Wed Feb 21 03:16:15 2001
@@ -121,8 +121,9 @@
     }
 }
 
-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 @@
 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 @@
 
        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 @@
                 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);
Index: php4/main/php_ini.h
diff -u php4/main/php_ini.h:1.31 php4/main/php_ini.h:1.32
--- php4/main/php_ini.h:1.31    Sun Jan  7 10:56:24 2001
+++ php4/main/php_ini.h Wed Feb 21 03:16:16 2001
@@ -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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]