Pacify IAR warnings for side-effects.

[bertos.git] / cfg / compiler.h

diff --git a/cfg/compiler.h b/cfg/compiler.h
index 456309427f51c74aca850ae9f41c6605fac00867..bf9ae35c6b7537fcc0af7aea27d61ce8f6cced5a 100755 (executable)
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/01/16 03:27:49  bernie
+ *#* Rename sig_t to sigbit_t to avoid clash with POSIX.
+ *#*
+ *#* Revision 1.7  2005/11/27 23:33:05  bernie
+ *#* Drop avr-libc hack for missing stdint.h.
+ *#*
+ *#* Revision 1.6  2005/07/19 07:27:31  bernie
+ *#* Don't use CPU_REG_BITS from cpu.h to avoid circular header dependendy.
+ *#*
+ *#* Revision 1.5  2005/06/27 21:24:37  bernie
+ *#* ticks_t: New typedef.
+ *#*
  *#* Revision 1.4  2005/06/14 06:15:10  bernie
  *#* Add X86_64 support.
  *#*
@@ -157,14 +169,9 @@
                #define DEPRECATED  __attribute__((__deprecated__))
        #endif
 
-       #if CPU_AVR
-               #include <stddef.h>
-               #include <stdbool.h>
-       #else
-               /* Include some standard C89/C99 stuff */
-               #include <stddef.h>
-               #include <stdbool.h>
-       #endif
+       /* Include some standard C89/C99 stuff */
+       #include <stddef.h>
+       #include <stdbool.h>
 
        #ifndef __cplusplus
                /*
@@ -323,11 +330,8 @@
                typedef unsigned long long   uint64_t;
        #endif
        /* \} */
-#elif defined(__GNUC__) && CPU_AVR
-       /* avr-libc is weird... (Fixed in avr-libc-1.2, hack to be removed soon) */
-       #include <inttypes.h>
 #else
-       /* This is the correct location. */
+       /* This is the standard location. */
        #include <stdint.h>
 #endif
 
@@ -336,12 +340,14 @@
         * The ATmega8 has a very small Flash, so we can't afford
         * to link in support routines for 32bit integer arithmetic.
         */
+       typedef int16_t ticks_t;  /*!< Type for time expressed in ticks. */
        typedef int16_t mtime_t;  /*!< Type for time expressed in milliseconds. */
        typedef int16_t utime_t;  /*!< Type for time expressed in microseconds. */
        #define SIZEOF_MTIME_T (16 / CPU_BITS_PER_CHAR)
        #define SIZEOF_UTIME_T (16 / CPU_BITS_PER_CHAR)
        #define MTIME_INFINITE 0x7FFFL
 #else
+       typedef int32_t ticks_t;  /*!< Type for time expressed in ticks. */
        typedef int32_t mtime_t;  /*!< Type for time expressed in milliseconds. */
        typedef int32_t utime_t;  /*!< Type for time expressed in microseconds. */
        #define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
@@ -351,9 +357,11 @@
 
 /*! Bulk storage large enough for both pointers or integers. */
 typedef void * iptr_t;
+
+/*! Bulk storage large enough for both pointers to constants or integers. */
 typedef const void * const_iptr_t;
 
-typedef unsigned char sig_t;     /*!< Type for signal bits. */
+typedef unsigned char sigbit_t;  /*!< Type for signal bits. */
 typedef unsigned char sigmask_t; /*!< Type for signal masks. */
 typedef unsigned char page_t;    /*!< Type for banked memory pages. */
 
@@ -372,22 +380,23 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
  * \{
  */
 #if !(defined(size_t) || defined(_SIZE_T_DEFINED) || defined(_BSD_SIZE_T_DEFINED_))
-       #if CPU_REG_BITS > 32
-               /* 64bit. */
+       #if CPU_X86
+               /* 32bit or 64bit (32bit for _WIN64). */
                typedef unsigned long size_t;
        #else
-               /* 32bit or 16bit. */
-               typedef unsigned int size_t;
+               #error Unknown CPU
        #endif
 #endif
 
 #if !(defined(ssize_t) || defined(__ssize_t_defined))
-       #if CPU_REG_BITS > 32
-               /* 64bit (32bit for _WIN64). */
+       #if CPU_X86
+               /* 32bit or 64bit (32bit for _WIN64). */
                typedef long ssize_t;
-       #else
-               /* 32bit or 16bit. */
+       #elif CPU_AVR
+               /* 16bit (missing in avr-libc's sys/types.h). */
                typedef int ssize_t;
+       #else
+               #error Unknown CPU
        #endif
 #endif
 /*\}*/