X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fcompiler.h;h=87cdd9425a4159617880e40e2a803d929089a397;hb=68ac3bfba91119369e42240a732f542c0c6d2736;hp=052565cfa7175110dcbf1bd108cadb44e5600aec;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 052565cf..87cdd942 100644
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -283,7 +283,6 @@
 #ifndef UNUSED_ARG
 #define UNUSED_ARG(type,arg)   type arg
 #endif
-#define UNUSED                 UNUSED_ARG /* OBSOLETE */
 #ifndef UNUSED_VAR
 #define UNUSED_VAR(type,name)  type name
 #endif
@@ -501,12 +500,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 */