X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27d566aff751aa91bc650bf1ea2f92d7cd5a7d52..6e5cfd7ff86900354c20502af95ee5f751492753:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 65add45af5..c0cac04a49 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -92,7 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 
 static void xbt_preinit(void)
 {
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
   mmalloc_preinit();
 #endif
   xbt_log_preinit();
@@ -123,25 +123,25 @@ static void xbt_preinit(void)
   XBT_LOG_CONNECT(xbt_parmap,xbt);
   XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
 
-  xbt_fifo_preinit();
-  xbt_dict_preinit();
 
   xbt_backtrace_preinit();
   xbt_os_thread_mod_preinit();
+  xbt_fifo_preinit();
+  xbt_dict_preinit();
 }
 
 static void xbt_postexit(void)
 {
-  xbt_os_thread_mod_postexit();
   xbt_backtrace_postexit();
 
   xbt_fifo_postexit();
   xbt_dict_postexit();
 
   xbt_log_postexit();
+  xbt_os_thread_mod_postexit();
 
   free(xbt_binary_name);
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
   mmalloc_postexit();
 #endif
 }
@@ -157,7 +157,7 @@ void xbt_init(int *argc, char **argv)
 
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int) time(NULL));
-  VERB0("Initialize XBT");
+  XBT_VERB("Initialize XBT");
 
   xbt_log_init(argc, argv);
 }
@@ -165,7 +165,7 @@ void xbt_init(int *argc, char **argv)
 /** @brief Finalize the xbt mechanisms. */
 void xbt_exit()
 {
-  WARN0("This function is deprecated, you shouldn't use it");
+  XBT_WARN("This function is deprecated, you shouldn't use it");
 }