Merge branch 'master' into v3.20-expose-simgrid-jni

[simgrid.git] / src / xbt / mmalloc / mmprivate.h

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 4854410fe619238f832edfd7740c3a3798b1a8a1..95d52c1784003a616379e0f88e2374435184b561 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,6 +26,13 @@
 #include <pthread.h>
 #include <stdint.h>
 
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #else