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 /winsup/cygwin/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 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/machine/_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/include/machine/_types.h b/winsup/cygwin/include/machine/_types.h index aafa9987c..50e704be2 100644 --- a/winsup/cygwin/include/machine/_types.h +++ b/winsup/cygwin/include/machine/_types.h @@ -11,16 +11,16 @@ typedef __uint16_t __uid16_t; typedef __uint16_t __gid16_t; #endif -#define __dev_t_defined +#define __machine_dev_t_defined typedef __uint32_t __dev_t; -#define __uid_t_defined +#define __machine_uid_t_defined typedef __uint32_t __uid_t; -#define __gid_t_defined +#define __machine_gid_t_defined typedef __uint32_t __gid_t; -#define __key_t_defined +#define __machine_key_t_defined typedef long long __key_t; #endif /* _MACHINE__TYPES_H */ |