X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fcfg%2Fcompiler.h;h=e8a76ab1af9e3fddb5af5bf8a753ab00fb670315;hb=74081ebc421ca63e090ae8027a634a0c1b8f6864;hp=08ccdead12ebc1462ee4b3785dc6a0a7fb3bf77a;hpb=b454c5eeaedb014041459893e6f7a430c9e52449;p=bertos.git

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 08ccdead..e8a76ab1 100644
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -486,8 +486,8 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 		typedef long ssize_t;
 	#elif CPU_ARM || CPU_CM3
 		typedef int ssize_t;
-	#elif CPU_AVR
-		/* 16bit (missing in avr-libc's sys/types.h). */
+	#elif CPU_AVR || CPU_MSP430
+		/* 16bit (missing in avr-/msp430-libc's sys/types.h). */
 		typedef int ssize_t;
 	#else
 		#error Unknown CPU
@@ -531,7 +531,22 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 	 *
 	 * \note This macro is non-standard, but implements a very common idiom
 	 */
-	#define countof(a)  (sizeof(a) / sizeof(*(a)))
+	#if defined(__GNUC__) && !defined(__cplusplus)
+		/*
+		 * Perform a compile time type checking: countof() can only
+		 * work with static arrays, so throw a compile time error if a
+		 * pointer is passed as argument.
+		 *
+		 * NOTE: the construct __builtin_types_compatible_p() is only
+		 * available for C.
+		 */
+		#define countof(a) (sizeof(a) / sizeof(*(a)) + \
+			sizeof(typeof(int[1 - 2 * \
+				!!__builtin_types_compatible_p(typeof(a), \
+						typeof(&a[0]))])) * 0)
+	#else
+		#define countof(a)  (sizeof(a) / sizeof(*(a)))
+	#endif
 #endif
 #ifndef alignof
 	/**