model-checker : merge conflict resolved

[simgrid.git] / src / mc / mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index d6a5063..0478629 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -1,7 +1,12 @@
+/* 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. */
+
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "mc/mc.h"
-#include "private.h"
+#include "mc_private.h"
 #include "xbt/log.h"
 #define _GNU_SOURCE
 
@@ -13,6 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
 /* Pointers to each of the heap regions to use */
 void *std_heap = NULL;          /* memory erased each time the MC stuff rollbacks to the beginning. Almost everything goes here */
 void *raw_heap = NULL;          /* memory persistent over the MC rollbacks. Only MC stuff should go there */
+/* int raw_heap_fd; */ /* unsued */
 
 /* Initialize the model-checker memory subsystem */
 /* It creates the two heap regions: std_heap and raw_heap */