X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..5f1dc33c9f76ee99973ba93f034f031451398ebe:/src/mc/mc_memory.cpp

diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
index fde3cd6ddf..d0bb0a6b55 100644
--- a/src/mc/mc_memory.cpp
+++ b/src/mc/mc_memory.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,30 +8,26 @@
 #include <fcntl.h>
 
 #include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/virtu.h"
 
 #include "mc/mc.h"
-#include "mc_object_info.h"
-#include "mc_private.h"
-
-extern "C" {
+#include "src/mc/mc_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");
 
+extern "C" {
+
 /* Initialize the model-checker memory subsystem */
 /* It creates the two heap regions: std_heap and mc_heap */
 void MC_memory_init()
 {
-  if (!malloc_use_mmalloc()) {
+  if (not malloc_use_mmalloc())
     xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
-  }
 }
 
 /* Finalize the memory subsystem */
-#include "xbt_modinter.h"
-void MC_memory_exit(void)
+void MC_memory_exit()
 {
 }