I forgot to update my tree before commiting (once again), and got conflicts as punishment

[simgrid.git] / include / msg / msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 4dccee2..d28939b 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -12,6 +12,8 @@
 #include "msg/datatypes.h"
 #include "xbt/automaton.h"
 
+#include "simgrid/simix.h"
+
 SG_BEGIN_DECL()
 
 /** @brief Return code of most MSG functions
@@ -100,6 +102,7 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char
                                                             code,
                                                             void *data,
                                                             m_host_t host,
+                                                            double kill_time,
                                                             int argc,
                                                             char **argv,
                                                             xbt_dict_t
@@ -191,7 +194,7 @@ XBT_PUBLIC(MSG_error_t)
 XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias);
 XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task,
                                                     const char *alias,
-                                                    int (*match_fun)(void*,void*),
+                                                    int (*match_fun)(void*,void*, smx_action_t),
                                                     void *match_data);
 
 XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup);
@@ -285,7 +288,6 @@ XBT_PUBLIC(int) MSG_get_channel_number(void);
 #include "instr/instr.h"
 
 /* Used only by the bindings */
-#include "simix/simix.h"
 XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process);
 
 SG_END_DECL()