Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index 00c9192..cf291f7 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -240,11 +240,6 @@ typedef struct s_sg_platf_trace_connect_cbarg {
   const char *element;
 } s_sg_platf_trace_connect_cbarg_t;
 
-typedef struct s_sg_platf_arg_cbarg *sg_platf_arg_cbarg_t;
-typedef struct s_sg_platf_arg_cbarg {
-  const char *value;
-} s_sg_platf_arg_cbarg_t;
-
 typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t;
 typedef struct s_sg_platf_process_cbarg {
   const char **argv;
@@ -288,6 +283,5 @@ XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage
 XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount);
 
 XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
-XBT_PUBLIC(void) sg_platf_new_arg(sg_platf_arg_cbarg_t arg);
 
 #endif                          /* SG_PLATF_H */

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index b424cdd..74a96d4 100644 (file)
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -43,7 +43,6 @@ typedef void (*sg_platf_mount_cb_t)(sg_platf_mount_cbarg_t);
 typedef void (*sg_platf_mstorage_cb_t)(sg_platf_mstorage_cbarg_t);
 
 typedef void (*sg_platf_process_cb_t)(sg_platf_process_cbarg_t);
-typedef void (*sg_platf_arg_cb_t)(sg_platf_arg_cbarg_t);
 
 void sg_platf_host_add_cb(sg_platf_host_cb_t);
 void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t);