From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 21 Jul 2011 09:59:53 +0000 (+0200)
Subject: Do not initialize mmalloc if !MMALLOC_WANT_OVERRIDE_LEGACY.
X-Git-Tag: v3_6_2~188^2~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d52b3c302824b631a2428ad881c66cab7844e753

Do not initialize mmalloc if !MMALLOC_WANT_OVERRIDE_LEGACY.

... and hope that it now builds on Hurd, where mmalloc_preinit()
fails.
---

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index a6aafc5626..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();
@@ -141,7 +141,7 @@ static void xbt_postexit(void)
   xbt_os_thread_mod_postexit();
 
   free(xbt_binary_name);
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
   mmalloc_postexit();
 #endif
 }