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 a971ba3..2b9359b 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -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);