Merge branch 'master' into mc

[simgrid.git] / src / xbt / log.c

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 06214ef..374191a 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -555,9 +555,6 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(xbt);
   XBT_LOG_CONNECT(graphxml_parse);
   XBT_LOG_CONNECT(log);
   XBT_LOG_CONNECT(xbt);
   XBT_LOG_CONNECT(graphxml_parse);
   XBT_LOG_CONNECT(log);

-#if HAVE_MMALLOC
-  XBT_LOG_CONNECT(mm_diff);
-#endif

   XBT_LOG_CONNECT(module);
   XBT_LOG_CONNECT(peer);
   XBT_LOG_CONNECT(replay);
   XBT_LOG_CONNECT(module);
   XBT_LOG_CONNECT(peer);
   XBT_LOG_CONNECT(replay);


@@ -640,6 +637,7 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(mc_memory);
   XBT_LOG_CONNECT(mc_memory_map);
   XBT_LOG_CONNECT(mc_request);
   XBT_LOG_CONNECT(mc_memory);
   XBT_LOG_CONNECT(mc_memory_map);
   XBT_LOG_CONNECT(mc_request);

+  XBT_LOG_CONNECT(mc_diff);

 #endif
 
   /* msg */
 #endif
 
   /* msg */