X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ceaa7392dd84bd6b76a143addd7db5871225c5b..01627ed90962b9953187f81388cd677219f4b1ad:/include/xbt/base.h diff --git a/include/xbt/base.h b/include/xbt/base.h index 6c8735aad1..f4de224de4 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -73,6 +73,8 @@ #define XBT_ATTRIB_DEPRECATED_v321(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.21 */ #define XBT_ATTRIB_DEPRECATED_v322(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.22 */ +#define XBT_ATTRIB_DEPRECATED_v323(mesg) \ + XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.23)") /* Will be dropped in v3.23 */ #define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio))) #define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__(prio))) @@ -89,17 +91,6 @@ # define XBT_THREAD_LOCAL No thread local on this architecture #endif -/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */ -#ifdef MIN -# undef MIN -#endif -#define MIN(a,b) ((a)<(b)?(a):(b)) - -#ifdef MAX -# undef MAX -#endif -#define MAX(a,b) ((a)>(b)?(a):(b)) - /* * Expands to `one' if there is only one argument for the variadic part. * Otherwise, expands to `more'. @@ -185,9 +176,6 @@ #endif -#define TRUE 1 -#define FALSE 0 - /* C++ users need love */ #ifndef SG_BEGIN_DECL # ifdef __cplusplus