X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=65effeca2b5305d49a7cf6a12bd7f9baeec45a64;hb=ad16d9a71a2a25267ee65a147c8bd73edecf8b8d;hp=e27959c7d76090a994e1cfeff16180ae33e353bc;hpb=ee873ba993e8ad36b0302dbc0543eeaebcf130f8;p=bertos.git

diff --git a/compiler.h b/compiler.h
index e27959c7..65effeca 100755
--- a/compiler.h
+++ b/compiler.h
@@ -6,15 +6,29 @@
  * This file is part of DevLib - See devlib/README for information.
  * -->
  *
- * \version $Id$
+ * \brief Additional support macros for compiler independance
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
- *
- * \brief Additional support macros for compiler independance
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.27  2004/10/21 10:09:40  bernie
+ *#* Remove spurious token in preprocessor directive.
+ *#*
+ *#* Revision 1.26  2004/10/19 08:55:14  bernie
+ *#* UNUSED_FUNC: New function attribute.
+ *#*
+ *#* Revision 1.25  2004/10/19 07:14:20  bernie
+ *#* Add macros to test for specific compiler features.
+ *#*
+ *#* Revision 1.24  2004/10/03 18:35:13  bernie
+ *#* Poison C++ keywords in C programs for better portability.
+ *#*
+ *#* Revision 1.23  2004/09/20 03:30:27  bernie
+ *#* Remove vsprintf_P() proto, no longer needed with avr-libc 1.0.4.
+ *#*
  *#* Revision 1.22  2004/09/14 21:03:04  bernie
  *#* PURE_FUNC, CONST_FUNC, MUST_CHECK: New function attributes; LIKELY()/UNLIKELY(): Fix for non-integral expressions.
  *#*
@@ -155,6 +169,11 @@
 
 #elif defined(__GNUC__)
 
+	/* Compiler features */
+	#define COMPILER_VARIADIC_MACROS 1 /* Even in C++ */
+	#define COMPILER_TYPEOF 1
+	#define COMPILER_STAEMENT_EXPRESSIONS 1
+
 	/* GCC attributes */
 	#define FORMAT(type,fmt,first)  __attribute__((__format__(type, fmt, first)))
 	#define NORETURN                __attribute__((__noreturn__))
@@ -164,6 +183,7 @@
 	#define UNLIKELY(x)             __builtin_expect(!!(x), 0)
 	#define PURE_FUNC               __attribute__((pure))
 	#define CONST_FUNC              __attribute__((const))
+	#define UNUSED_FUNC             __attribute__((unused))
 	#define RESTRICT                __restrict__
 	#define MUST_CHECK              __attribute__((warn_unused_result))
 	#if GNUC_PREREQ(3,1)
@@ -184,22 +204,32 @@
 		#include <stddef.h>
 		#include <stdbool.h>
 
-		/* Missing printf-family functions in avr-libc/stdio.h */
-		#include <stdarg.h>
-		#include <avr/pgmspace.h>
-		int vsprintf_P(char *buf, const char * PROGMEM fmt, va_list ap);
-
 		/* Support for harvard architectures */
 		#ifdef _PROGMEM
 			#define PGM_READ_CHAR(s) pgm_read_byte(s)
 			#define PGM_FUNC(x) x ## _P
-			#define PGM_ATTR        PROGMEM
+			#define PGM_ATTR  PROGMEM
 		#endif
 
 	#endif
 
+	#ifndef __cplusplus
+		/*
+		 * Disallow some C++ keywords as identifiers in C programs,
+		 * for improved portability.
+		 */
+		#pragma GCC poison new delete class template typename
+		#pragma GCC poison private protected public operator
+		#pragma GCC poison friend mutable using namespace
+		#pragma GCC poison cin cout cerr clog
+	#endif
+
 #elif defined(__MWERKS__) && CPU_DSP56K
 
+	/* Compiler features */
+	#define COMPILER_TYPEOF 1
+	#define COMPILER_STAEMENT_EXPRESSIONS 1
+
 	#include <stdint.h>
 	#include <stddef.h>
 	#include <stdbool.h>
@@ -213,6 +243,32 @@
 #endif
 
 
+/* Defaults for compiler extensions. */
+
+/*!
+ * \def COMPILER_VARIADIC_MACROS
+ * Support for macros with variable arguments.
+ */
+#ifndef COMPILER_HAVE_VARIADIC_MACROS
+#define COMPILER_HAVE_VARIADIC_MACROS (COMPILER_C99 != 0)
+#endif
+
+/*!
+ * \def COMPILER_TYPEOF
+ * Support for macros with variable arguments.
+ */
+#ifndef COMPILER_TYPEOF
+#define COMPILER_TYPEOF 0
+#endif
+
+/*!
+ * \def COMPILER_STATEMENT_EXPRESSIONS
+ * Support for macros with variable arguments.
+ */
+#ifndef COMPILER_STATEMENT_EXPRESSIONS
+#define COMPILER_STATEMENT_EXPRESSIONS 0
+#endif
+
 /* A few defaults for missing compiler features. */
 #ifndef INLINE
 #define INLINE                 static inline
@@ -247,6 +303,9 @@
 #ifndef CONST_FUNC
 #define CONST_FUNC             /* nothing */
 #endif
+#ifndef UNUSED_FUNC
+#define UNUSED_FUNC            /* nothing */
+#endif
 #ifndef RESTRICT
 #define RESTRICT               /* nothing */
 #endif
@@ -280,9 +339,11 @@
 
 /* Support for hybrid C/C++ applications. */
 #ifdef __cplusplus
+	#define EXTERN_C        extern "C"
 	#define EXTERN_C_BEGIN  extern "C" {
 	#define EXTERN_C_END    }
 #else
+	#define EXTERN_C        extern
 	#define EXTERN_C_BEGIN  /* nothing */
 	#define EXTERN_C_END    /* nothing */
 #endif