X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3a7be8a83ef66f846254955a4c5a0af0abd25a4..9b3780913f771e32ac6686a7f97b1a8248f11b27:/src/xbt/log.c

diff --git a/src/xbt/log.c b/src/xbt/log.c
index eee33f2c74..7853627699 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -24,8 +24,12 @@
 #include "xbt/sysdep.h"
 #include "xbt/xbt_os_thread.h"
 
+#ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
 static xbt_os_mutex_t log_cat_init_mutex = NULL;