X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..35d84011da1f114490d6eb4d77e214edf56c810f:/src/xbt/mallocator.c diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c index f898c39e80..fa9f5828e8 100644 --- a/src/xbt/mallocator.c +++ b/src/xbt/mallocator.c @@ -6,12 +6,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/internal_config.h" #include "xbt/mallocator.h" +#include "mallocator_private.h" +#include "simgrid/modelchecker.h" /* kill mallocators when model-checking is enabled */ +#include "src/internal_config.h" #include "xbt/asserts.h" #include "xbt/sysdep.h" -#include "mc/mc.h" /* kill mallocators when model-checking is enabled */ -#include "mallocator_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators"); @@ -71,7 +71,7 @@ void xbt_mallocator_initialization_is_done(int protect) /** used by the module to know if it's time to activate the mallocators yet */ static inline int xbt_mallocator_is_active(void) { -#if HAVE_MALLOCATOR +#if SIMGRID_HAVE_MALLOCATOR return initialization_done && !MC_is_active(); #else return 0;