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/machine | |
| 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/machine')
| -rw-r--r-- | newlib/libc/machine/aarch64/machine/_types.h | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/spu/machine/_types.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/newlib/libc/machine/aarch64/machine/_types.h b/newlib/libc/machine/aarch64/machine/_types.h index 7df9f8db1..c846741fc 100644 --- a/newlib/libc/machine/aarch64/machine/_types.h +++ b/newlib/libc/machine/aarch64/machine/_types.h @@ -31,7 +31,7 @@ #include <machine/_default_types.h> -#define __ssize_t_defined +#define __machine_ssize_t_defined typedef long signed int _ssize_t; #endif /* _MACHINE__TYPES_H */ diff --git a/newlib/libc/machine/spu/machine/_types.h b/newlib/libc/machine/spu/machine/_types.h index d58c617a8..edff17554 100644 --- a/newlib/libc/machine/spu/machine/_types.h +++ b/newlib/libc/machine/spu/machine/_types.h @@ -39,22 +39,22 @@ /* * fpos_t large enough for either 32 or 64 bit ppc glibc fpos_t. */ -#define __fpos_t_defined +#define __machine_fpos_t_defined typedef struct { char __pos[16]; } _fpos_t; #ifdef __LARGE64_FILES -#define __fpos64_t_defined +#define __machine_fpos64_t_defined typedef _fpos_t _fpos64_t; #endif -#define __dev_t_defined +#define __machine_dev_t_defined typedef int __dev_t; -#define __uid_t_defined +#define __machine_uid_t_defined typedef unsigned int __uid_t; -#define __gid_t_defined +#define __machine_gid_t_defined typedef unsigned int __gid_t; #endif /* _MACHINE__TYPES_H */ |