Spelling/grammar fixes.

[bertos.git] / macros.h

diff --git a/macros.h b/macros.h
index 90f6b7dbd8e6e7bd5069770e02c0a64637d7b3e2..797db21dbd65fba3b71550f8482b9a9107368e68 100755 (executable)
--- a/macros.h
+++ b/macros.h
@@ -13,42 +13,68 @@
  * \brief Common and handy function macros
  */
 
-/*
- * $Log$
- * Revision 1.2  2004/08/24 13:32:14  bernie
- * PP_CAT(), PP_STRINGIZE(): Move back to compiler.h to break circular dependency between cpu.h/compiler.h/macros.h;
- * offsetof(), countof(): Move back to compiler.h to avoid including macros.h almost everywhere;
- * Trim CVS log;
- * Rename header guards;
- * Don't include arch_config.h in compiler.h as it's not needed there.
- *
- * Revision 1.1  2004/08/14 19:37:57  rasky
- * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
- *
- * Revision 1.4  2004/08/14 18:36:50  rasky
- * Doxygen fix e un livello di parentesi aggiuntivi per la macro
- *
- * Revision 1.3  2004/08/12 20:01:32  rasky
- * Aggiunte macro BIT_CHANGE e BIT_CHANGE_BV
- *
- * Revision 1.2  2004/08/10 21:36:14  rasky
- * Aggiunto include macros.h dove serve
- * Aggiunta dipendenza da compiler.h in macros.h
- *
- * Revision 1.1  2004/08/10 21:30:00  rasky
- * Estratte le funzioni macro in macros.h
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.4  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.3  2004/08/24 14:13:48  bernie
+ *#* Restore a few macros that were lost in the way.
+ *#*
+ *#* Revision 1.2  2004/08/24 13:32:14  bernie
+ *#* PP_CAT(), PP_STRINGIZE(): Move back to compiler.h to break circular dependency between cpu.h/compiler.h/macros.h;
+ *#* offsetof(), countof(): Move back to compiler.h to avoid including macros.h almost everywhere;
+ *#* Trim CVS log;
+ *#* Rename header guards;
+ *#* Don't include arch_config.h in compiler.h as it's not needed there.
+ *#*
+ *#* Revision 1.1  2004/08/14 19:37:57  rasky
+ *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *#*
+ *#* Revision 1.4  2004/08/14 18:36:50  rasky
+ *#* Doxygen fix e un livello di parentesi aggiuntivi per la macro
+ *#*
+ *#* Revision 1.3  2004/08/12 20:01:32  rasky
+ *#* Aggiunte macro BIT_CHANGE e BIT_CHANGE_BV
+ *#*
+ *#* Revision 1.2  2004/08/10 21:36:14  rasky
+ *#* Aggiunto include macros.h dove serve
+ *#* Aggiunta dipendenza da compiler.h in macros.h
+ *#*
+ *#* Revision 1.1  2004/08/10 21:30:00  rasky
+ *#* Estratte le funzioni macro in macros.h
+ *#*
+ *#*/
 
 #ifndef MACROS_H
 #define MACROS_H
 
 #include <compiler.h>
 
-/* Simple macros */
-#define ABS(a)      (((a) < 0) ? -(a) : (a))
-#define MIN(a,b)    (((a) < (b)) ? (a) : (b))
-#define MAX(a,b)    (((a) > (b)) ? (a) : (b))
+/* Type-generic macros */
+#if GNUC_PREREQ(2,0)
+       #define ABS(n) ({ \
+               __typeof__(n) _n = (n); \
+               (_n < 0) ? -_n : _n; \
+       })
+       #define MIN(a,b) ({ \
+               __typeof__(a) _a = (a); \
+               __typeof__(b) _b = (b); \
+               (void)(&_a == &_b); /* ensure same type */ \
+               (_a < _b) ? _a : _b; \
+       })
+       #define MAX(a,b) ({ \
+               __typeof__(a) _a = (a); \
+               __typeof__(b) _b = (b); \
+               (void)(&_a == &_b); /* ensure same type */ \
+               (_a > _b) ? _a : _b; \
+       })
+#else /* !GNUC */
+       /* Buggy macros for inferior compilers.  */
+       #define ABS(a)          (((a) < 0) ? -(a) : (a))
+       #define MIN(a,b)        (((a) < (b)) ? (a) : (b))
+       #define MAX(a,b)        (((a) > (b)) ? (a) : (b))
+#endif /* !GNUC */
 
 #ifndef BV
 /*! Convert a bit value to a binary flag */
@@ -89,8 +115,7 @@
 
 /*! Issue a compilation error if the \a condition is false */
 #define STATIC_ASSERT(condition)  \
-       extern char CT_ASSERT___[(condition) ? 1 : -1]
-
+       extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
 
 #if COMPILER_C99
        /*!