X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fmacros.h;h=69c404851c14b107709b3e7f8e3bfe6ac66049dc;hb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;hp=1006fc42e6ac9cfee30ce838aeb04a7953933b4f;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git diff --git a/bertos/cfg/macros.h b/bertos/cfg/macros.h index 1006fc42..69c40485 100644 --- a/bertos/cfg/macros.h +++ b/bertos/cfg/macros.h @@ -33,7 +33,7 @@ * \brief Common and handy function macros * * \version $Id$ - * \author Bernardo Innocenti + * \author Bernie Innocenti * \author Giovanni Bajo */ #ifndef CFG_MACROS_H @@ -68,8 +68,8 @@ * were mixed in an expression. \ * Even in _a and _b are of the same type, \ * if mixed in an expression the type will be \ - * promoted to int! \ - */ \ + * (at least) promoted to int! \ + */ \ ((typeof(_a))((_a < _b) ? _a : _b)); \ }) #define MAX(a,b) ({ \ @@ -84,8 +84,8 @@ * were mixed in an expression. \ * Even in _a and _b are of the same type, \ * if mixed in an expression the type will be \ - * promoted to int! \ - */ \ + * (at least) promoted to int! \ + */ \ ((typeof(_a))((_a > _b) ? _a : _b)); \ }) #else /* !(COMPILER_STATEMENT_EXPRESSIONS && COMPILER_TYPEOF) */ @@ -166,9 +166,6 @@ /** Round up \a x to an even multiple of the 2's power \a pad. */ #define ROUND_UP2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1)) -/* OBSOLETE */ -#define ROUND2 ROUND_UP2 - /** * \name Integer round macros. *