X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fcompiler.h;h=0121b96367fe067cc98ba9a92004356c05ef56a5;hb=e5dbc5ca1aa5b9dcdacd0b736ee40c15546fcee0;hp=8c217c009641115685977aac40ab046aacaaf19c;hpb=245f240a4720c5b2f582842a1cd773dafd8c9f97;p=bertos.git

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 8c217c00..0121b963 100644
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -209,6 +209,7 @@
 	#define RESTRICT                __restrict__
 	#define MUST_CHECK              __attribute__((warn_unused_result))
 	#define PACKED                  __attribute__((packed))
+	#define ALIGNED(x)              __attribute__ ((__aligned__(x)))
 	#if CPU_ARM | CPU_CM3
 		#define NAKED		__attribute__((naked))
 	#else
@@ -360,6 +361,9 @@
 #ifndef PACKED
 #define PACKED                 /* nothing */
 #endif
+#ifndef ALIGNED
+#define ALIGNED                /* nothing */
+#endif
 #ifndef MEMORY_BARRIER
 #define MEMORY_BARRIER         /* nothing */
 #warning No memory barrier defined for select compiler. If you use the kernel check it.
@@ -540,10 +544,10 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 		 * 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)
+		#define countof(a) (sizeof(a) / sizeof(*(a)) +		\
+				STATIC_ASSERT_EXPR(			\
+					!__builtin_types_compatible_p(	\
+						typeof(a), typeof(&a[0]))))
 	#else
 		#define countof(a)  (sizeof(a) / sizeof(*(a)))
 	#endif