From: casanova Date: Mon, 5 Dec 2005 19:42:23 +0000 (+0000) Subject: Added an #ifndef/#endif around the #define MIN so that things X-Git-Tag: v3.3~3501 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/44289400e7292ba766239b9b58591f6115447b98?ds=sidebyside Added an #ifndef/#endif around the #define MIN so that things compile smoothly. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1857 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index 3354c00b67..1ac3636a79 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -13,7 +13,9 @@ #include "gras/DataDesc/datadesc_interface.h" #include "gras/Transport/transport_interface.h" /* gras_select */ +#ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg,gras,"High level messaging");