Merge conflicts in instr_routing.c

[simgrid.git] / src / include / mc / datatypes.h

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 9c0e545..da5a3ca 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -1,7 +1,4 @@
-/*     $Id: datatypes.h 5497 2008-05-26 12:19:15Z cristianrosa $        */
-
-/* Copyright (c) 2008 Martin Quinson, Cristian Rosa.
-   All rights reserved.                                          */
+/* Copyright (c) 2008-2012. Da SimGrid Team. All rights reserved.           */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -17,6 +14,12 @@ SG_BEGIN_DECL()
 /******************************* Transitions **********************************/
 typedef struct s_mc_transition *mc_transition_t;
 
-SG_END_DECL()
+typedef struct s_mc_ignore_region{
+  int block;
+  int fragment;
+  void *address;
+  size_t size;
+}s_mc_ignore_region_t, *mc_ignore_region_t;
 
-#endif /* _MC_MC_H */
+SG_END_DECL()
+#endif                          /* _MC_MC_H */