PGM_STR(): New macro.

[bertos.git] / cfg / compiler.h

diff --git a/cfg/compiler.h b/cfg/compiler.h
index 93f699275d75c56ad6c90b0bfe5784e3a6c858e6..af4928ee5aa664d93d1fa32f0783d4ed33b3d487 100755 (executable)
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
+ *#*
  *#* Revision 1.3  2005/04/12 01:37:01  bernie
  *#* Metrowerks touchups from HeCo.
  *#*
@@ -306,14 +312,22 @@
         * \{
         */
        typedef signed char         int8_t;
-       typedef short int           int16_t;
-       typedef long int            int32_t;
        typedef unsigned char       uint8_t;
+       typedef short int           int16_t;
        typedef unsigned short int  uint16_t;
-       typedef unsigned long int   uint32_t;
+       typedef long int            int32_t; /* _WIN64 safe */
+       typedef unsigned long int   uint32_t; /* _WIN64 safe */
+
+       #ifdef _MSC_VER
+               typedef __int64              int64_t;
+               typedef unsigned __int64     uint64_t;
+       #else
+               typedef long long            int64_t;
+               typedef unsigned long long   uint64_t;
+       #endif
        /* \} */
 #elif defined(__GNUC__) && CPU_AVR
-       /* avr-libc is weird... */
+       /* avr-libc is weird... (Fixed in avr-libc-1.2, hack to be removed soon) */
        #include <inttypes.h>
 #else
        /* This is the correct location. */
@@ -325,12 +339,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)
@@ -340,6 +356,8 @@
 
 /*! 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. */
@@ -364,10 +382,18 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
        #if CPU_REG_BITS > 32
                /* 64bit. */
                typedef unsigned long size_t;
-               typedef long ssize_t;
        #else
                /* 32bit or 16bit. */
                typedef unsigned int size_t;
+       #endif
+#endif
+
+#if !(defined(ssize_t) || defined(__ssize_t_defined))
+       #if CPU_REG_BITS > 32
+               /* 64bit (32bit for _WIN64). */
+               typedef long ssize_t;
+       #else
+               /* 32bit or 16bit. */
                typedef int ssize_t;
        #endif
 #endif