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 5e41d31..8e25f90 100644 (file)
--- a/tools/gras/struct_diff.c
+++ b/tools/gras/struct_diff.c
@@ -16,8 +16,9 @@
 
 #include "xbt.h"
 #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/datatypes.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) {
@@ -143,14 +144,14 @@ int main(int argc, char** argv) {
       if (field->offset[GRAS_THISARCH]<= offset&&
           field->offset[GRAS_THISARCH]+field->type->size[GRAS_THISARCH] >= offset) {
         found = 1;
-        printf("This offset is somewhere in field %s, which starts at offset %zu and is of size %zu\n",
+        printf("This offset is somewhere in field %s, which starts at offset %ld and is of size %ld\n",
               field->name,field->offset[GRAS_THISARCH],field->type->size[GRAS_THISARCH]);
 
       }
     }
     if (!found) {
 
-      printf("Damnit, the structure is too short to find the the field (last field %s was at offset %zu, with size %zu). Weird.\n",
+      printf("Damnit, the structure is too short to find the the field (last field %s was at offset %ld, with size %ld). Weird.\n",
           field->name,field->offset[GRAS_THISARCH],field->type->size[GRAS_THISARCH]);
     }
   }