X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fcompiler.h;h=5cacf1dca66fe20041b8e2fa0aa5133b66aad3d0;hb=b3fe69febaf2e2e41937b0f0e0dfad9b5fcbc3a5;hp=7357f43f69789bdb380192795a18e5fc59121c6e;hpb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;p=bertos.git

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 7357f43f..5cacf1dc 100644
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -490,6 +490,16 @@ typedef unsigned char page_t;    /**< Type for banked memory pages. */
 	 */
 	#define countof(a)  (sizeof(a) / sizeof(*(a)))
 #endif
+#ifndef alignof
+	/**
+	 * Return the alignment in memory of a generic data type.
+	 *
+	 * \note We need to worry about alignment when allocating memory that
+	 * will be used later by unknown objects (e.g., malloc()) or, more
+	 * generally, whenever creating generic container types.
+	 */
+	#define alignof(type) offsetof(struct { char c; type member; }, member)
+#endif
 
 /**
  * Cast a member of a structure out to the containing structure.
@@ -500,12 +510,12 @@ typedef unsigned char page_t;    /**< Type for banked memory pages. */
  */
 #if COMPILER_TYPEOF && COMPILER_STATEMENT_EXPRESSIONS
 	#define containerof(ptr, type, member) ({ \
-		const typeof( ((type *)0)->member ) *_mptr = (ptr); /* type check */ \
-		(type *)((char *)_mptr - offsetof(type, member)); \
+		typeof( ((type *)0)->member ) *_mptr = (ptr); /* type check */ \
+		(type *)(void *)((char *)_mptr - offsetof(type, member)); \
 	})
 #else
 	#define containerof(ptr, type, member) \
-		( (type *)((char *)(ptr) - offsetof(type, member)) )
+		( (type *)(void *)((char *)(ptr) - offsetof(type, member)) )
 #endif
 
 /** Issue a compilation error if the \a condition is false */