Merge pull request #1 from mquinson/master

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 437782f..47e937a 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -11,7 +11,7 @@
 
 #include "simgrid/instr.h"
 #include "instr/instr_interface.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "simgrid_config.h"
 
 SG_BEGIN_DECL()
@@ -89,7 +89,7 @@ typedef enum {
 
 typedef struct s_container *container_t;
 typedef struct s_container {
-  sg_routing_edge_t net_elm;
+  sg_netcard_t net_elm;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
   type_t type;    /* Type of this container */
@@ -276,7 +276,7 @@ XBT_PRIVATE int TRACE_msg_process_is_enabled(void);
 XBT_PRIVATE int TRACE_msg_vm_is_enabled(void);
 XBT_PRIVATE int TRACE_buffer (void);
 XBT_PRIVATE int TRACE_disable_link(void);
-XBT_PRIVATE int TRACE_disable_power(void);
+XBT_PRIVATE int TRACE_disable_speed(void);
 XBT_PRIVATE int TRACE_onelink_only (void);
 XBT_PRIVATE int TRACE_disable_destroy (void);
 XBT_PRIVATE int TRACE_basic (void);
@@ -465,7 +465,7 @@ typedef struct s_instr_extra_data {
 SG_END_DECL()
 
 #ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
 #endif
 
 #endif /* INSTR_PRIVATE_H_ */