X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=macros.h;h=f027ce2bee11039bac286f360d3165a15772325d;hb=4fcd224037bf57ae177034834492de5521662afd;hp=2d6cfb4f632de1250837e7d026a464e98cde7df2;hpb=ea4ef51b306fde6480c03f72e81c4b31d51660f6;p=bertos.git

diff --git a/macros.h b/macros.h
index 2d6cfb4f..f027ce2b 100755
--- a/macros.h
+++ b/macros.h
@@ -15,6 +15,16 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -38,21 +48,30 @@
 
 #include <compiler.h>
 
-/* Quasi-ANSI macros */
-#ifndef offsetof
-	/*! offsetof(s,m) - Return the byte offset of the member \a m in struct \a s */
-	#define offsetof(s,m)   (size_t)&(((s *)0)->m)
-#endif
-#ifndef countof
-	/*! Count the number of elements in the static array \a a */
-	#define countof(a)      (sizeof(a) / sizeof(*(a)))
-#endif
-
-
-/* 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 */
@@ -83,17 +102,6 @@
 #define UINT32_LOG2(x) \
 	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
 
-/*! Concatenate two different preprocessor tokens (allowing macros to expand) */
-#define PP_CAT(x,y)         PP_CAT__(x,y)
-#define PP_CAT__(x,y)       x ## y
-#define PP_CAT3(x,y,z)      PP_CAT(PP_CAT(x,y),z)
-#define PP_CAT4(x,y,z,w)    PP_CAT(PP_CAT3(x,y,z),w)
-#define PP_CAT5(x,y,z,w,j)  PP_CAT(PP_CAT4(x,y,z,w),j)
-
-/*! String-ize a token (allowing macros to expand) */
-#define PP_STRINGIZE(x)     PP_STRINGIZE__(x)
-#define PP_STRINGIZE__(x)   #x
-
 #if COMPILER_C99
 	/*! Count the number of arguments (up to 16) */
 	#define PP_COUNT(...) \
@@ -104,8 +112,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
 	/*!