X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/181823a28f9e67fec70e2e24dd45b92449808e4b..9b3780913f771e32ac6686a7f97b1a8248f11b27:/src/xbt/mallocator.c diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c index 77a6915640..9b7bd8e8eb 100644 --- a/src/xbt/mallocator.c +++ b/src/xbt/mallocator.c @@ -13,8 +13,12 @@ #include "xbt/asserts.h" #include "xbt/sysdep.h" +#ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX #define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");