Merge bugfix from branch mc-refactor

[simgrid.git] / src / xbt / mmalloc / mm.c

diff --git a/src/xbt/mmalloc/mm.c b/src/xbt/mmalloc/mm.c
index c25f26d..d5d5610 100644 (file)
--- a/src/xbt/mmalloc/mm.c
+++ b/src/xbt/mmalloc/mm.c
@@ -6,7 +6,7 @@
 
 /* Copyright 1996, 2000 Free Software Foundation  */
 
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -19,5 +19,6 @@
 #include "mmalloc.c"
 #include "mrealloc.c"
 #include "mmorecore.c"
-#include "mm_module.c"
 #include "mm_legacy.c"
+#include "mm_module.c"
+#include "mm_diff.c"