merge conflicts

[simgrid.git] / include / xbt / automatonparse_promela.h

diff --git a/include/xbt/automatonparse_promela.h b/include/xbt/automatonparse_promela.h
index edcad66760aa6f7832cf742f4564bd47f9e88c00..cb4fc9cb54bf91a2487b6701022bc3a65280ff64 100644 (file)
--- a/include/xbt/automatonparse_promela.h
+++ b/include/xbt/automatonparse_promela.h
@@ -9,7 +9,7 @@ xbt_automaton_t automaton;
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC(void) init();
+XBT_PUBLIC(void) init(void);
 
 XBT_PUBLIC(void) new_state(char* id, int src);
 
@@ -17,7 +17,9 @@ XBT_PUBLIC(void) new_transition(char* id, xbt_exp_label_t label);
 
 XBT_PUBLIC(xbt_exp_label_t) new_label(int type, ...);
 
-XBT_PUBLIC(xbt_automaton_t) get_automaton();
+XBT_PUBLIC(xbt_automaton_t) get_automaton(void);
+                           
+XBT_PUBLIC(void) display_automaton(void);
 
 SG_END_DECL()