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

diff --combined src/mc/mc_private.h
index 9481343,b37a075..09e8932
--- 1/src/mc/mc_private.h
--- 2/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);