merge conflicts

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

diff --git a/include/simix/simix.h b/include/simix/simix.h
index 967dd5d..8d7a03d 100644 (file)
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -63,8 +63,8 @@ XBT_PUBLIC(void*) SIMIX_host_self_get_data(void);
 XBT_PUBLIC(int) SIMIX_process_count(void);
 XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
-XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
-XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
+XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data);
+XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self);
 XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t);
 XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
 
@@ -134,7 +134,7 @@ XBT_PUBLIC(void) SIMIX_req_process_killall(void);
 /* Process handling */
 XBT_PUBLIC(void) SIMIX_req_process_cleanup(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_req_process_change_host(smx_process_t process,
-                                           const char *source, const char *dest);
+                                              smx_host_t dest);
 XBT_PUBLIC(void) SIMIX_req_process_suspend(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_req_process_resume(smx_process_t process);