DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.

[bertos.git] / compiler.h

diff --git a/compiler.h b/compiler.h
index b1939426ee0d971eeb76a51153742dae9444f932..638473283a80baf34fbdc473dcf607f160fa55a4 100755 (executable)
--- a/compiler.h
+++ b/compiler.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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 +120,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
@@ -172,7 +186,6 @@
 #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
@@ -216,12 +229,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
 
@@ -251,6 +261,7 @@
 #elif defined(__MWERKS__) && CPU_DSP56K
 
        /* Compiler features */
+       #define COMPILER_VARIADIC_MACROS 1
        #define COMPILER_TYPEOF 1
        #define COMPILER_STATEMENT_EXPRESSIONS 1
 
@@ -273,8 +284,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
 
 /*!
@@ -427,7 +438,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 +461,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