X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fmacros.h;h=081b20334cff9846f610a1a8c0b9338fc26fd2d1;hb=396b9f1df305883558347215b0a4895981ddea81;hp=ded2261bd9d64de06631508109a5e8bd293a30bc;hpb=ff16c7e3fd2184d58a87d5fe1576cd246ecb719e;p=bertos.git

diff --git a/cfg/macros.h b/cfg/macros.h
index ded2261b..081b2033 100755
--- a/cfg/macros.h
+++ b/cfg/macros.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/02/20 14:34:58  bernie
+ *#* Use portable type checking.
+ *#*
  *#* Revision 1.6  2006/02/10 12:36:57  bernie
  *#* Pacify IAR warnings for side-effects.
  *#*
@@ -102,13 +105,13 @@
 	#define MIN(a,b) ({ \
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
+		ASSERT_TYPE_EQUAL(_a, _b); \
 		(_a < _b) ? _a : _b; \
 	})
 	#define MAX(a,b) ({ \
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
+		ASSERT_TYPE_EQUAL(_a, _b); \
 		(_a > _b) ? _a : _b; \
 	})
 #else /* !(COMPILER_STATEMENT_EXPRESSIONS && COMPILER_TYPEOF) */
@@ -132,8 +135,8 @@
 	 */
 	#define SWAP(a, b) \
 		do { \
-			(void)(&(a) == &(b)); /* type check */ \
 			typeof(a) tmp; \
+			ASSERT_TYPE_EQUAL(a, b); \
 			tmp = (a); \
 			(a) = (b); \
 			(b) = tmp; \