X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bcc1dbe28f658ea786ba234a679601edd30758a..217557096673710f29ebe590ffcf76329ddd87de:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index d908a7d326..6aa57755ef 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -17,8 +17,8 @@ #include "xbt/config.h" #include "xbt/xbt_os_time.h" #include "xbt/function_types.h" -#include "xbt/ex_interface.h" -#include "instr/instr_private.h" +#include "src/xbt/ex_interface.h" +#include "src/instr/instr_private.h" #include "smx_process_private.h" #include "smx_host_private.h" #include "smx_io_private.h" @@ -47,7 +47,7 @@ typedef struct s_smx_global { smx_process_t maestro_process; xbt_dict_t registered_functions; smx_creation_func_t create_process_function; - void_pfn_smxprocess_t_smxprocess_t kill_process_function; + void_pfn_smxprocess_t kill_process_function; /** Callback used when killing a SMX_process */ void_pfn_smxprocess_t cleanup_process_function; xbt_mallocator_t synchro_mallocator; @@ -83,15 +83,6 @@ typedef struct s_smx_file { void* data; /**< @brief user data */ } s_smx_file_t; -/*********************************** Time ************************************/ - -/** @brief Timer datatype */ -typedef struct s_smx_timer { - double date; - void* func; - void* args; -} s_smx_timer_t; - /********************************* synchro *************************************/ typedef enum {