Compilation fixes for gcc 15 (Peter Pentchev)HEADmaster

2 files changed, 27 insertions, 27 deletions

diff --git a/mixguile/xmixguile_cmd_dispatcher.c b/mixguile/xmixguile_cmd_dispatcher.c
index 69b704d..a6b778f 100644
--- a/mixguile/xmixguile_cmd_dispatcher.c
+++ b/mixguile/xmixguile_cmd_dispatcher.c
@@ -522,31 +522,31 @@ mix_add_global_post_hook_ (SCM function)
 
 /* NULL-terminated list of available scm commands */
 const scm_command_t DEFAULT_SCM_COMMANDS_[] = {
-  {"mixvm-cmd", mixvm_cmd_, 2, 0, 0},
-  {"mixvm-status", mixvm_status_, 0, 0, 0},
-  {"mix-last-result", mix_last_result_, 0, 0, 0},
-  {"mix-reg", mix_reg_, 1, 0, 0},
-  {"mix-set-reg!", mix_set_reg_, 2, 0, 0},
-  {"mix-cell", mix_cell_, 1, 0, 0},
-  {"mix-set-cell!", mix_set_cell_, 2, 0, 0},
-  {"mix-over", mix_over_, 0, 0, 0},
-  {"mix-loc", mix_loc_, 0, 0, 0},
-  {"mix-set-over!", mix_set_over_, 1, 0, 0},
-  {"mix-cmp", mix_cmp_, 0, 0, 0},
-  {"mix-up-time", mix_uptime_, 0, 0, 0},
-  {"mix-lap-time", mix_laptime_, 0, 0, 0},
-  {"mix-prog-time", mix_progtime_, 0, 0, 0},
-  {"mix-prog-name", mix_prog_name_, 0, 0, 0},
-  {"mix-prog-path", mix_prog_path_, 0, 0, 0},
-  {"mix-src-name", mix_src_name_, 0, 0, 0},
-  {"mix-src-path", mix_src_path_, 0, 0, 0},
-  {"mix-src-line-no", mix_src_line_no_, 0, 0, 0},
-  {"mix-src-line", mix_src_line_, 0, 1, 0},
-  {"mix-ddir", mix_ddir_, 0, 0, 0},
-  {"mix-set-cmp!", mix_set_cmp_, 1, 0, 0},
-  {"mix-add-pre-hook", mix_add_pre_hook_, 2, 0, 0},
-  {"mix-add-post-hook", mix_add_post_hook_, 2, 0, 0},
-  {"mix-add-global-pre-hook", mix_add_global_pre_hook_, 1, 0, 0},
-  {"mix-add-global-post-hook", mix_add_global_post_hook_, 1, 0, 0},
+  {"mixvm-cmd", (scm_func_t)mixvm_cmd_, 2, 0, 0},
+  {"mixvm-status", (scm_func_t)mixvm_status_, 0, 0, 0},
+  {"mix-last-result", (scm_func_t)mix_last_result_, 0, 0, 0},
+  {"mix-reg", (scm_func_t)mix_reg_, 1, 0, 0},
+  {"mix-set-reg!", (scm_func_t)mix_set_reg_, 2, 0, 0},
+  {"mix-cell", (scm_func_t)mix_cell_, 1, 0, 0},
+  {"mix-set-cell!", (scm_func_t)mix_set_cell_, 2, 0, 0},
+  {"mix-over", (scm_func_t)mix_over_, 0, 0, 0},
+  {"mix-loc", (scm_func_t)mix_loc_, 0, 0, 0},
+  {"mix-set-over!", (scm_func_t)mix_set_over_, 1, 0, 0},
+  {"mix-cmp", (scm_func_t)mix_cmp_, 0, 0, 0},
+  {"mix-up-time", (scm_func_t)mix_uptime_, 0, 0, 0},
+  {"mix-lap-time", (scm_func_t)mix_laptime_, 0, 0, 0},
+  {"mix-prog-time", (scm_func_t)mix_progtime_, 0, 0, 0},
+  {"mix-prog-name", (scm_func_t)mix_prog_name_, 0, 0, 0},
+  {"mix-prog-path", (scm_func_t)mix_prog_path_, 0, 0, 0},
+  {"mix-src-name", (scm_func_t)mix_src_name_, 0, 0, 0},
+  {"mix-src-path", (scm_func_t)mix_src_path_, 0, 0, 0},
+  {"mix-src-line-no", (scm_func_t)mix_src_line_no_, 0, 0, 0},
+  {"mix-src-line", (scm_func_t)mix_src_line_, 0, 1, 0},
+  {"mix-ddir", (scm_func_t)mix_ddir_, 0, 0, 0},
+  {"mix-set-cmp!", (scm_func_t)mix_set_cmp_, 1, 0, 0},
+  {"mix-add-pre-hook", (scm_func_t)mix_add_pre_hook_, 2, 0, 0},
+  {"mix-add-post-hook", (scm_func_t)mix_add_post_hook_, 2, 0, 0},
+  {"mix-add-global-pre-hook", (scm_func_t)mix_add_global_pre_hook_, 1, 0, 0},
+  {"mix-add-global-post-hook", (scm_func_t)mix_add_global_post_hook_, 1, 0, 0},
   {NULL}
 };
diff --git a/mixguile/xmixguile_cmd_dispatcher.h b/mixguile/xmixguile_cmd_dispatcher.h
index 4298267..b3501f9 100644
--- a/mixguile/xmixguile_cmd_dispatcher.h
+++ b/mixguile/xmixguile_cmd_dispatcher.h
@@ -37,7 +37,7 @@ struct mixguile_cmd_dispatcher_t
 
 /* scm commands types */
 /* prototype of a function implementing a new scm function */
-typedef SCM (*scm_func_t) ();
+typedef SCM (*scm_func_t) (...);
 
 /* record for a new scm command */
 typedef struct scm_command_t