merge msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...

[simgrid.git] / src / simix / popping_private.h

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 8e0d5dd..52c0b71 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -15,8 +15,8 @@ XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
 #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
 #include "mc/mc_interface.h" /* Definition of mc_snapshot_t, used by one simcall */
 
-typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
-typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
+typedef int (*simix_match_func_t)(void *, void *, smx_synchro_t);
+typedef void (*simix_copy_data_func_t)(smx_synchro_t, void*, size_t);
 typedef void (*simix_clean_func_t)(void *);
 typedef void (*FPtr)(void); // Hide the ugliness
 
@@ -68,7 +68,7 @@ typedef struct s_smx_simcall {
 
 void SIMIX_simcall_answer(smx_simcall_t);
 void SIMIX_simcall_handle(smx_simcall_t, int);
-void SIMIX_simcall_exit(smx_action_t);
+void SIMIX_simcall_exit(smx_synchro_t);
 const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 
 SG_END_DECL()