Gcc is *very* permissive with pointers to functions. If we declare them as function...

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 54a0295..863a15b 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -24,22 +24,22 @@ void nil_function(void)
   return;
 }
 
-void_f_void_t *STag_surfxml_platform_description_fun = nil_function;
-void_f_void_t *ETag_surfxml_platform_description_fun = nil_function;
-void_f_void_t *STag_surfxml_cpu_fun = nil_function;
-void_f_void_t *ETag_surfxml_cpu_fun = nil_function;
-void_f_void_t *STag_surfxml_router_fun = nil_function;
-void_f_void_t *ETag_surfxml_router_fun = nil_function;
-void_f_void_t *STag_surfxml_network_link_fun = nil_function;
-void_f_void_t *ETag_surfxml_network_link_fun = nil_function;
-void_f_void_t *STag_surfxml_route_fun = nil_function;
-void_f_void_t *ETag_surfxml_route_fun = nil_function;
-void_f_void_t *STag_surfxml_route_element_fun = nil_function;
-void_f_void_t *ETag_surfxml_route_element_fun = nil_function;
-void_f_void_t *STag_surfxml_process_fun = nil_function;
-void_f_void_t *ETag_surfxml_process_fun = nil_function;
-void_f_void_t *STag_surfxml_argument_fun = nil_function;
-void_f_void_t *ETag_surfxml_argument_fun = nil_function;
+void_f_void_t STag_surfxml_platform_description_fun = nil_function;
+void_f_void_t ETag_surfxml_platform_description_fun = nil_function;
+void_f_void_t STag_surfxml_cpu_fun = nil_function;
+void_f_void_t ETag_surfxml_cpu_fun = nil_function;
+void_f_void_t STag_surfxml_router_fun = nil_function;
+void_f_void_t ETag_surfxml_router_fun = nil_function;
+void_f_void_t STag_surfxml_network_link_fun = nil_function;
+void_f_void_t ETag_surfxml_network_link_fun = nil_function;
+void_f_void_t STag_surfxml_route_fun = nil_function;
+void_f_void_t ETag_surfxml_route_fun = nil_function;
+void_f_void_t STag_surfxml_route_element_fun = nil_function;
+void_f_void_t ETag_surfxml_route_element_fun = nil_function;
+void_f_void_t STag_surfxml_process_fun = nil_function;
+void_f_void_t ETag_surfxml_process_fun = nil_function;
+void_f_void_t STag_surfxml_argument_fun = nil_function;
+void_f_void_t ETag_surfxml_argument_fun = nil_function;
 
 YY_BUFFER_STATE surf_input_buffer;
 FILE *surf_file_to_parse;
@@ -106,82 +106,82 @@ void STag_surfxml_platform_description(void)
              "Last, do not forget to also update your values for "
              "the calls to MSG_task_create (if any).");
 
-  STag_surfxml_platform_description_fun();
+  (*STag_surfxml_platform_description_fun)();
 }
 
 void ETag_surfxml_platform_description(void)
 {
-  ETag_surfxml_platform_description_fun();
+  (*ETag_surfxml_platform_description_fun)();
 }
 
 void STag_surfxml_cpu(void)
 {
-  STag_surfxml_cpu_fun();
+  (*STag_surfxml_cpu_fun)();
 }
 
 void ETag_surfxml_cpu(void)
 {
-  ETag_surfxml_cpu_fun();
+  (*ETag_surfxml_cpu_fun)();
 }
 
 void STag_surfxml_router(void)
 {
-  STag_surfxml_router_fun();
+  (*STag_surfxml_router_fun)();
 }
 
 void ETag_surfxml_router(void)
 {
-  ETag_surfxml_router_fun();
+  (*ETag_surfxml_router_fun)();
 }
 
 void STag_surfxml_network_link(void)
 {
-  STag_surfxml_network_link_fun();
+  (*STag_surfxml_network_link_fun)();
 }
 
 void ETag_surfxml_network_link(void)
 {
-  ETag_surfxml_network_link_fun();
+  (*ETag_surfxml_network_link_fun)();
 }
 
 void STag_surfxml_route(void)
 {
-  STag_surfxml_route_fun();
+  (*STag_surfxml_route_fun)();
 }
 
 void ETag_surfxml_route(void)
 {
-  ETag_surfxml_route_fun();
+  (*ETag_surfxml_route_fun)();
 }
 
 void STag_surfxml_route_element(void)
 {
-  STag_surfxml_route_element_fun();
+  (*STag_surfxml_route_element_fun)();
 }
 
 void ETag_surfxml_route_element(void)
 {
-  ETag_surfxml_route_element_fun();
+  (*ETag_surfxml_route_element_fun)();
 }
 
 void STag_surfxml_process(void)
 {
-  STag_surfxml_process_fun();
+  (*STag_surfxml_process_fun)();
 }
 
 void ETag_surfxml_process(void)
 {
-  ETag_surfxml_process_fun();
+  (*ETag_surfxml_process_fun)();
 }
 
 void STag_surfxml_argument(void)
 {
-  STag_surfxml_argument_fun();
+  (*STag_surfxml_argument_fun)();
 }
 
 void ETag_surfxml_argument(void)
 {
-  ETag_surfxml_argument_fun();
+  (*ETag_surfxml_argument_fun)();
 }
 
 void surf_parse_open(const char *file)
@@ -226,7 +226,7 @@ static int _surf_parse(void)
   return surf_parse_lex();
 }
 
-int_f_void_t *surf_parse = _surf_parse;
+int_f_void_t surf_parse = _surf_parse;
 
 void surf_parse_get_double(double *value, const char *string)
 {