Merge branches 'MC_LTL' and 'MC_LTL' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index d67fc61..68dfe46 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -27,7 +27,7 @@ enum heap_action_type{
   NOTSET
 };
 
-typedef struct surf_action_network_CM02_im {
+typedef struct surf_action_network_CM02 {
   s_surf_action_t generic_action;
   s_xbt_swag_hookup_t action_list_hookup;
   double latency;
@@ -35,14 +35,12 @@ typedef struct surf_action_network_CM02_im {
   double weight;
   lmm_variable_t variable;
   double rate;
-#ifdef HAVE_SMPI
   struct {
      const char* link_name;
      double gap;
      double size;
      xbt_fifo_item_t fifo_item;
   } sender;
-#endif
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int latency_limited;
 #endif
@@ -54,6 +52,6 @@ typedef struct surf_action_network_CM02_im {
   int index_heap;
   enum heap_action_type hat;
   double last_update;
-} s_surf_action_network_CM02_im_t, *surf_action_network_CM02_im_t;
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
 #endif                          /* _SURF_NETWORK_PRIVATE_H */