X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=028ef3ad57fafaeabedba505713993b3e18836de;hb=2be772f4027c5ea6ef0966d5aa0a6a3533dff9cc;hp=96cfa2b24c928a21da2d5a7737fa3ffa99d869b6;hpb=046f4cd759bce6d07837492c08b1246fc7a1da76;p=bertos.git

diff --git a/cfg/compiler.h b/cfg/compiler.h
index 96cfa2b2..028ef3ad 100755
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2006/04/11 00:07:33  bernie
+ *#* Implemenent MF_SAVESEL flag.
+ *#*
+ *#* Revision 1.18  2006/03/22 13:34:34  bernie
+ *#* MSVC support.
+ *#*
+ *#* Revision 1.17  2006/03/22 09:48:35  bernie
+ *#* Formatting.
+ *#*
+ *#* Revision 1.16  2006/03/20 17:48:09  bernie
+ *#* Fix for avr-libc; INTERRUPT(): Remove macro.
+ *#*
+ *#* Revision 1.15  2006/03/13 02:06:25  bernie
+ *#* containerof(): New macro.
+ *#*
+ *#* Revision 1.14  2006/02/23 08:36:33  bernie
+ *#* Emulate __func__ on MSVC.
+ *#*
  *#* Revision 1.13  2006/02/23 07:37:37  bernie
  *#* Compile fix for MSVC.
  *#*
@@ -181,6 +199,14 @@
 	#define snprintf _snprintf
 	#define vsnprintf _vsnprintf
 
+	/* MSVC doesn't support C99's __func__, but has a similar extension. */
+	#define __func__ __FUNCTION__
+
+	/* MSVC doesn't support C99's inline keyword */
+	#ifndef __cplusplus
+		#define INLINE __inline
+	#endif
+
 #elif defined(__GNUC__)
 
 	/* Compiler features */
@@ -218,7 +244,9 @@
 	#include <stddef.h>
 	#include <stdint.h>
 	#include <stdbool.h>
+	#if !CPU_AVR
 	#include <sys/types.h> /* for ssize_t */
+	#endif
 
 	#ifndef __cplusplus
 		/*
@@ -306,9 +334,6 @@
 #ifndef REGISTER
 #define REGISTER               /* nothing */
 #endif
-#ifndef INTERRUPT
-#define INTERRUPT(x)           ERROR_NOT_IMPLEMENTED
-#endif
 #ifndef LIKELY
 #define LIKELY(x)              x
 #endif
@@ -348,12 +373,14 @@
 	#define EXTERN_C        extern "C"
 	#define EXTERN_C_BEGIN  extern "C" {
 	#define EXTERN_C_END    }
-	#define EXTERN_CONST	extern const
+	#define EXTERN_CONST    extern const
+	#define CONST_CAST(TYPE,EXPR)   (const_cast<TYPE>(EXPR))
 #else
 	#define EXTERN_C        extern
 	#define EXTERN_C_BEGIN  /* nothing */
 	#define EXTERN_C_END    /* nothing */
-	#define EXTERN_CONST	const
+	#define EXTERN_CONST    const
+	#define CONST_CAST(TYPE,EXPR)   ((TYPE)(EXPR)) /* FIXME: How can we suppress the warning in C? */
 #endif
 
 
@@ -494,6 +521,23 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
 	#define countof(a)  (sizeof(a) / sizeof(*(a)))
 #endif
 
+/**
+ * Cast a member of a structure out to the containing structure.
+ *
+ * \param ptr     the pointer to the member.
+ * \param type    the type of the container struct this is embedded in.
+ * \param member  the name of the member within the struct.
+ */
+#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)); \
+	})
+#else
+	#define containerof(ptr, type, member) \
+		( (type *)((char *)(ptr) - offsetof(type, member)) )
+#endif
+
 /*! Issue a compilation error if the \a condition is false */
 #define STATIC_ASSERT(condition)  \
 	UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
@@ -505,9 +549,9 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
 #endif
 
 #ifndef ASSERT_TYPE_IS
-/*! Ensure variable is of specified type. */
+/** Ensure variable is of specified type. */
 #define ASSERT_TYPE_IS(var, type)  \
-		do { (void)(&var == (type *)0); } while(0)
+		do { (void)(&(var) == (type *)0); } while(0)
 #endif
 
 #endif /* DEVLIB_COMPILER_H */