From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 3 May 2012 08:54:19 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_7~30^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cb91af44a1bd7e5f331686df25d5fe80ff571a43?hp=-c

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
---

cb91af44a1bd7e5f331686df25d5fe80ff571a43
diff --combined src/mc/mc_private.h
index 9481343e5f,b37a075f77..09e8932ec1
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@@ -19,7 -19,6 +19,6 @@@
  #include "xbt/hash.h"
  #include "msg/msg.h"
  #include "msg/datatypes.h"
- #include "simix/datatypes.h"
  
  /****************************** Snapshots ***********************************/
  
@@@ -254,8 -253,6 +253,8 @@@ void set_pair_reached(xbt_state_t st)
  int reached_hash(xbt_state_t st);
  void set_pair_reached_hash(xbt_state_t st);
  int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
 +int data_program_region_compare(void *d1, void *d2, size_t size);
 +int data_libsimgrid_region_compare(void *d1, void *d2, size_t size);
  void MC_pair_delete(mc_pair_t pair);
  void MC_exit_liveness(void);
  mc_state_t MC_state_pair_new(void);