From 011b6e172c0b7366132196dd9797f7bc3b951df2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 1 Feb 2012 15:47:45 +0100 Subject: [PATCH] move a global definition so that we can kill the sbrk stuff: we'll never use it --- src/xbt/mmalloc/mm_legacy.c | 7 +++++++ src/xbt/mmalloc/sbrk-sup.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c index f520762bac..105dc0a7f6 100644 --- a/src/xbt/mmalloc/mm_legacy.c +++ b/src/xbt/mmalloc/mm_legacy.c @@ -13,6 +13,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt, "Logging specific to mm_legacy in mmalloc"); +/* The mmalloc() package can use a single implicit malloc descriptor + for mmalloc/mrealloc/mfree operations which do not supply an explicit + descriptor. This allows mmalloc() to provide + backwards compatibility with the non-mmap'd version. */ +struct mdesc *__mmalloc_default_mdp; + + static void *__mmalloc_current_heap = NULL; /* The heap we are currently using. */ #include "xbt_modinter.h" diff --git a/src/xbt/mmalloc/sbrk-sup.c b/src/xbt/mmalloc/sbrk-sup.c index 522cbfcab2..40638c970c 100644 --- a/src/xbt/mmalloc/sbrk-sup.c +++ b/src/xbt/mmalloc/sbrk-sup.c @@ -20,13 +20,6 @@ static void *sbrk_morecore(struct mdesc *mdp, int size); extern void *sbrk(int size); #endif -/* The mmalloc() package can use a single implicit malloc descriptor - for mmalloc/mrealloc/mfree operations which do not supply an explicit - descriptor. For these operations, sbrk() is used to obtain more core - from the system, or return core. This allows mmalloc() to provide - backwards compatibility with the non-mmap'd version. */ - -struct mdesc *__mmalloc_default_mdp; /* Use sbrk() to get more core. */ -- 2.20.1