X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=macros.h;h=8723fc1ccc36d64b846fdfbe76d9ccae689fb084;hb=b1aa8cba3c035de2f0cb7463bb22fa542a2c3175;hp=90f6b7dbd8e6e7bd5069770e02c0a64637d7b3e2;hpb=79fab4476f08c6aa8696b52a788a4c724d57b170;p=bertos.git

diff --git a/macros.h b/macros.h
index 90f6b7db..8723fc1c 100755
--- a/macros.h
+++ b/macros.h
@@ -13,42 +13,69 @@
  * \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.5  2004/08/29 21:57:58  bernie
+ *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h;
+ *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.
+ *#*
+ *#* 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 */
@@ -87,11 +114,6 @@
 		count
 #endif
 
-/*! Issue a compilation error if the \a condition is false */
-#define STATIC_ASSERT(condition)  \
-	extern char CT_ASSERT___[(condition) ? 1 : -1]
-
-
 #if COMPILER_C99
 	/*!
 	 * \def BIT_CHANGE(reg, (mask, value), ...)