model-checker : merge conflict resolved

[simgrid.git] / src / mc / mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index eb0f614..179f7bb 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -39,7 +39,6 @@ extern char *prog_name;
 
 void MC_take_snapshot(mc_snapshot_t);
 void MC_take_snapshot_liveness(mc_snapshot_t s);
-void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s);
 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
 
@@ -139,7 +138,6 @@ void MC_print_statistics_pairs(mc_stats_pair_t);
 
 extern void *std_heap;
 extern void *raw_heap;
-/* extern int raw_heap_fd; */ /* unused */
 #define STD_HEAP_SIZE   20480000        /* Maximum size of the system's heap */
 
 /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */