X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=compiler.h;h=3eb3f6a6ea4a76c28dcae08714d616adaab35444;hb=96f8c49fdf97d48ddbacb1d8d94fd5a735051e2d;hp=b1939426ee0d971eeb76a51153742dae9444f932;hpb=300b57c992a407846d319dc9b3ff1968e86a7fdb;p=bertos.git

diff --git a/compiler.h b/compiler.h
index b1939426..3eb3f6a6 100755
--- a/compiler.h
+++ b/compiler.h
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.38  2004/12/31 16:41:52  bernie
+ *#* PROGMEM: Define to nothing for non-Harvard processors.
+ *#*
+ *#* Revision 1.37  2004/12/08 09:43:21  bernie
+ *#* Metrowerks supports variadic macros.
+ *#*
+ *#* Revision 1.36  2004/12/08 08:55:54  bernie
+ *#* Rename sigset_t to sigmask_t and time_t to mtime_t, to avoid conflicts with POSIX definitions.
+ *#*
+ *#* Revision 1.35  2004/12/08 07:35:51  bernie
+ *#* Typo in macro name.
+ *#*
  *#* Revision 1.34  2004/11/28 23:21:33  bernie
  *#* Use mtime_t instead of overloading ANSI time_t with new semantics.
  *#*
@@ -111,6 +123,11 @@
 	#define GNUC_PREREQ(maj, min) 0
 #endif
 
+/* Some CW versions do not allow enabling C99 from the settings panel. */
+#if defined(__MWERKS__)
+	#pragma c99 on
+#endif
+
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 	#define COMPILER_C99      1
 #else
@@ -136,7 +153,8 @@
 	#define REGISTER      shortad
 	#define INLINE        /* unsupported */
 
-	/* Imported from <longjmp.h>. Unfortunately, we can't just include
+	/*
+	 * Imported from <longjmp.h>. Unfortunately, we can't just include
 	 * this header because it typedefs jmp_buf to be an array of chars.
 	 * This would allow the compiler to place the buffer on an odd address.
 	 * The CPU _should_ be able to perform word accesses to
@@ -154,9 +172,9 @@
 	 */
 	struct _JMP_BUF
 	{
-		void *	sp;				/* Stack pointer */
-		void *	return_addr;	/* Return address */
-		int		lr[6];			/* 6 local registers */
+		void *sp;           /* Stack pointer */
+		void *return_addr;  /* Return address */
+		int lr[6];          /* 6 local registers */
 	};
 
 	typedef struct _JMP_BUF jmp_buf[1];
@@ -172,15 +190,14 @@
 #elif defined(_MSC_VER) /* Win32 emulation support */
 
 	#include <setjmp.h>
-	#include <time.h> /* for time_t */
 
 	/* FIXME: I can't remember why exactly this was needed (NdBernie) */
 	#define float double
 
-	/* Fake bool support */
+	/* MSVC doesn't provide <stdbool.h>. */
 	#ifndef __cplusplus
-		#define true 1
-		#define false 0
+		#define true (1==1)
+		#define false (1!=1)
 		typedef int bool;
 	#endif /* !__cplusplus */
 
@@ -216,12 +233,9 @@
 
 	#if CPU_X86
 
-		/* Hack to avoid conflicts with system type */
-		#define sigset_t system_sigset_t
 		#include <stddef.h>
 		#include <setjmp.h>
 		#include <stdbool.h>
-		#undef system_sigset_t
 
 	#elif CPU_AVR
 
@@ -230,10 +244,12 @@
 
 		/* Support for harvard architectures */
 		#ifdef _PROGMEM
+			#include <avr/pgmspace.h>
 			#define PGM_READ_CHAR(s) pgm_read_byte(s)
 			#define PGM_FUNC(x) x ## _P
 			#define PGM_ATTR  PROGMEM
 		#endif
+		#define PROGMEM  __attribute__((__progmem__))
 
 	#endif
 
@@ -251,6 +267,7 @@
 #elif defined(__MWERKS__) && CPU_DSP56K
 
 	/* Compiler features */
+	#define COMPILER_VARIADIC_MACROS 1
 	#define COMPILER_TYPEOF 1
 	#define COMPILER_STATEMENT_EXPRESSIONS 1
 
@@ -273,8 +290,8 @@
  * \def COMPILER_VARIADIC_MACROS
  * Support for macros with variable arguments.
  */
-#ifndef COMPILER_HAVE_VARIADIC_MACROS
-#define COMPILER_HAVE_VARIADIC_MACROS (COMPILER_C99 != 0)
+#ifndef COMPILER_VARIADIC_MACROS
+#define COMPILER_VARIADIC_MACROS (COMPILER_C99 != 0)
 #endif
 
 /*!
@@ -319,6 +336,9 @@
 #ifndef REGISTER
 #define REGISTER               /* nothing */
 #endif
+#ifndef PROGMEM
+#define PROGMEM                /* nothing */
+#endif
 #ifndef INTERRUPT
 #define INTERRUPT(x)           ERROR_NOT_IMPLEMENTED
 #endif
@@ -361,7 +381,6 @@
 #define PGM_ATTR        /* nothing */
 #endif
 
-
 /* Misc definitions */
 #ifndef NULL
 #define NULL  (void *)0
@@ -427,7 +446,7 @@ typedef void * iptr_t;
 typedef const void * const_iptr_t;
 
 typedef unsigned char sig_t;     /*!< Type for signal bits. */
-typedef unsigned char sigset_t;  /*!< Type for signal masks. */
+typedef unsigned char sigmask_t; /*!< Type for signal masks. */
 typedef unsigned char page_t;    /*!< Type for banked memory pages. */
 
 
@@ -450,7 +469,7 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
 	#endif
 #endif
 
-#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined))
+#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined) || defined(_EMUL))
 	/*! For backwards compatibility.  Use mtime_t in new code. */
 	#define time_t mtime_t
 	#define SIZEOF_TIME_T SIZEOF_MTIME_T