Prepare network.c and cpu_cas01.c for net and cpu merge.

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 6e10c38..1fe0b96 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,12 +17,6 @@
 
 #define NO_MAX_DURATION -1.0
 
-typedef enum {
-  UM_FULL,
-  UM_LAZY,
-  UM_UNDEFINED
-} e_UM_t;
-
 /* user-visible parameters */
 extern double sg_tcp_gamma;
 extern double sg_sender_gap;
@@ -175,7 +169,7 @@ typedef struct s_as {
                            const char *dst, route_t e_route);
 } s_as_t;
 
-struct s_routing_global {
+struct s_routing_platf {
   AS_t root;
   void *loopback;
   xbt_dynar_t last_route;