X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fmacros.h;h=1006fc42e6ac9cfee30ce838aeb04a7953933b4f;hb=07382ad480794063a2d5be63547eb288034d9832;hp=f0520eff74b24d5a145eabe29f994aa2d0496f88;hpb=36ba2f39c6edb8358e8395ee346eefb2446e35a9;p=bertos.git

diff --git a/cfg/macros.h b/cfg/macros.h
index f0520eff..1006fc42 100644
--- a/cfg/macros.h
+++ b/cfg/macros.h
@@ -60,13 +60,33 @@
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
 		ASSERT_TYPE_EQUAL(_a, _b); \
-		(_a < _b) ? _a : _b; \
+		/** \
+		 * The (typeof(_a)) cast in necessary: \
+		 * result type of conditional expressions is \
+		 * *NOT* the type of the value returned but \
+		 * the type that would be produced if _a and _b \
+		 * 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! \
+		*/ \
+		((typeof(_a))((_a < _b) ? _a : _b)); \
 	})
 	#define MAX(a,b) ({ \
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
 		ASSERT_TYPE_EQUAL(_a, _b); \
-		(_a > _b) ? _a : _b; \
+		/** \
+		 * The (typeof(_a)) cast in necessary: \
+		 * result type of conditional expressions is \
+		 * *NOT* the type of the value returned but \
+		 * the type that would be produced if _a and _b \
+		 * 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! \
+		*/ \
+		((typeof(_a))((_a > _b) ? _a : _b)); \
 	})
 #else /* !(COMPILER_STATEMENT_EXPRESSIONS && COMPILER_TYPEOF) */
 	/* Buggy macros for inferior compilers.  */