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

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

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index bdf84df..2b9359b 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -7,7 +7,7 @@
 #ifndef _SIMIX_PROCESS_PRIVATE_H
 #define _SIMIX_PROCESS_PRIVATE_H
 
-#include "simix/datatypes.h"
+#include "simgrid/simix.h"
 #include "smx_smurf_private.h"
 
 /** @brief Process datatype */
@@ -50,6 +50,7 @@ void SIMIX_process_create(smx_process_t *process,
                           xbt_main_func_t code,
                           void *data,
                           const char *hostname,
+                          double kill_time,
                           int argc, char **argv,
                           xbt_dict_t properties);
 void SIMIX_process_runall(void);
@@ -68,7 +69,7 @@ void SIMIX_process_change_host(smx_process_t process,
                               smx_host_t dest);
 void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t host);
 void SIMIX_pre_process_suspend(smx_simcall_t simcall);
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
 void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
 void* SIMIX_process_get_data(smx_process_t process);
 void SIMIX_process_set_data(smx_process_t process, void *data);