projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use correct macro name.
[bertos.git]
/
bertos
/
cfg
/
macros.h
diff --git
a/bertos/cfg/macros.h
b/bertos/cfg/macros.h
index 1006fc42e6ac9cfee30ce838aeb04a7953933b4f..69c404851c14b107709b3e7f8e3bfe6ac66049dc 100644
(file)
--- a/
bertos/cfg/macros.h
+++ b/
bertos/cfg/macros.h
@@
-33,7
+33,7
@@
* \brief Common and handy function macros
*
* \version $Id$
* \brief Common and handy function macros
*
* \version $Id$
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Giovanni Bajo <rasky@develer.com>
*/
#ifndef CFG_MACROS_H
* \author Giovanni Bajo <rasky@develer.com>
*/
#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 \
* 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) ({ \
((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 \
* 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) */
((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))
/** 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.
*
/**
* \name Integer round macros.
*