diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-15 13:44:12 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-15 14:51:39 +0200 |
| commit | 8a5af1a184b9aa1f37fd72670e164e41f27569b1 (patch) | |
| tree | f3be08ae33e56ec14655ae48bd3851e4c9a02224 /newlib/libc/sys/rtems/include | |
| parent | 9f90ae04358fc3f78e1c561209cc7117309ddfd8 (diff) | |
| download | cygnal-8a5af1a184b9aa1f37fd72670e164e41f27569b1.tar.gz cygnal-8a5af1a184b9aa1f37fd72670e164e41f27569b1.tar.bz2 cygnal-8a5af1a184b9aa1f37fd72670e164e41f27569b1.zip | |
Use __machine_*_t_defined for internal types
Newlib defines defaults for internal types via <sys/_types.h> and uses
<machine/_types.h> to let targets define their own type if necessary.
Previously for example
#ifndef __dev_t_defined
typedef short __dev_t;
#endif
However, the __*_t_defined pattern conflicts with the glibc type guard
pattern for user types, e.g. dev_t in this example. Introduce a
__machine_*_t_defined pattern for internal types (defined by
<machine/_types.h>, used by <sys/_types.h>). For example
#ifndef __machine_dev_t_defined
typedef short __dev_t;
#endif
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diffstat (limited to 'newlib/libc/sys/rtems/include')
| -rw-r--r-- | newlib/libc/sys/rtems/include/machine/_types.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/newlib/libc/sys/rtems/include/machine/_types.h b/newlib/libc/sys/rtems/include/machine/_types.h index e0d93f7fe..f17d28139 100644 --- a/newlib/libc/sys/rtems/include/machine/_types.h +++ b/newlib/libc/sys/rtems/include/machine/_types.h @@ -1,35 +1,25 @@ -/* - * $Id$ - */ - #ifndef _MACHINE__TYPES_H -#define _MACHINE__TYPES_H +#define _MACHINE__TYPES_H #include <machine/_default_types.h> -typedef __int32_t blksize_t; -typedef __int32_t blkcnt_t; +typedef __int32_t blksize_t; +typedef __int32_t blkcnt_t; -typedef __uint64_t __dev_t; -#define __dev_t_defined 1 +typedef __uint64_t __dev_t; +#define __machine_dev_t_defined #if defined(__arm__) || defined(__i386__) || defined(__m68k__) || defined(__mips__) || defined(__PPC__) || defined(__sparc__) -/* Use 64bit types */ -typedef __int64_t _off_t; -#define __off_t_defined 1 - -typedef __int64_t _fpos_t; -#define __fpos_t_defined 1 +typedef __int64_t _off_t; #else -/* Use 32bit types */ -typedef __int32_t _off_t; -#define __off_t_defined 1 - -typedef __int32_t _fpos_t; -#define __fpos_t_defined 1 +typedef __int32_t _off_t; #endif +#define __machine_off_t_defined -typedef __uint32_t _mode_t; -#define __mode_t_defined 1 +typedef _off_t _fpos_t; +#define __machine_fpos_t_defined -#endif +typedef __uint32_t _mode_t; +#define __machine_mode_t_defined + +#endif /* _MACHINE__TYPES_H */ |