From 711953521c19fe51576c1491037e38eb338bc2c6 Mon Sep 17 00:00:00 2001 From: bernie Date: Tue, 16 Nov 2004 22:30:19 +0000 Subject: [PATCH] Declare fixed-size types before other types. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@281 38d2e660-2303-0410-9eaa-f027e97ec537 --- compiler.h | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/compiler.h b/compiler.h index 933a3f19..466ed2d4 100755 --- a/compiler.h +++ b/compiler.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.30 2004/11/16 22:30:19 bernie + *#* Declare fixed-size types before other types. + *#* *#* Revision 1.29 2004/11/16 20:34:40 bernie *#* UNUSED_VAR, USED_VAR, USED_FUNC: New macros; UNUSED_ARG: Rename from UNUSED. *#* @@ -368,28 +371,6 @@ #endif -/* - * Standard type definitions. - * These should be in , but many compilers lack them. - */ -#if !(defined(size_t) || defined(_SIZE_T_DEFINED)) - typedef unsigned int size_t; - typedef int ssize_t; -#endif -#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined)) - typedef long time_t; -#endif /* _TIME_T_DEFINED || __time_t_defined */ - -/*! Bulk storage large enough for both pointers or integers */ -typedef void * iptr_t; -typedef const void * const_iptr_t; -#define IPTR iptr_t /* OBSOLETE */ - -typedef long utime_t; /*!< Type for time expressed in microseconds */ -typedef unsigned char sig_t; /*!< Type for signal bits */ -typedef unsigned char sigset_t; /*!< Type for signal masks */ -typedef unsigned char page_t; /*!< Type for banked memory pages */ - #if (defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)) /*! * \name ISO C99 fixed-size types @@ -412,6 +393,29 @@ typedef unsigned char page_t; /*!< Type for banked memory pages */ #include #endif + +/* + * Standard type definitions. + * These should be in , but many compilers lack them. + */ +#if !(defined(size_t) || defined(_SIZE_T_DEFINED)) + typedef unsigned int size_t; + typedef int ssize_t; +#endif +#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined)) + typedef long time_t; +#endif /* _TIME_T_DEFINED || __time_t_defined */ + +/*! Bulk storage large enough for both pointers or integers */ +typedef void * iptr_t; +typedef const void * const_iptr_t; +#define IPTR iptr_t /* OBSOLETE */ + +typedef long utime_t; /*!< Type for time expressed in microseconds */ +typedef unsigned char sig_t; /*!< Type for signal bits */ +typedef unsigned char sigset_t; /*!< Type for signal masks */ +typedef unsigned char page_t; /*!< Type for banked memory pages */ + /*! * \name Types for hardware registers. * -- 2.25.1