I forgot to update my tree before commiting (once again), and got conflicts as punishment

[simgrid.git] / tools / gras / struct_diff.c

diff --git a/tools/gras/struct_diff.c b/tools/gras/struct_diff.c
index c8758a0..8e25f90 100644 (file)
--- a/tools/gras/struct_diff.c
+++ b/tools/gras/struct_diff.c
@@ -18,7 +18,7 @@
 #include "xbt/datadesc.h"
 #include "xbt/file_stat.h"
 #include "../../src/xbt/datadesc/datadesc_private.h" // RAAAAH! ugly relative path, but it's late, I want it to be done NOW.
 #include "xbt/datadesc.h"
 #include "xbt/file_stat.h"
 #include "../../src/xbt/datadesc/datadesc_private.h" // RAAAAH! ugly relative path, but it's late, I want it to be done NOW.

-#include "simix/simix.h"
+#include "simgrid/simix.h"

 #include "../../src/simix/smx_smurf_private.h" // RAAAAH! ugly relative path, but it's even later and it still doesn't work
 
 static void define_types(void) {
 #include "../../src/simix/smx_smurf_private.h" // RAAAAH! ugly relative path, but it's even later and it still doesn't work
 
 static void define_types(void) {