diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-15 14:44:14 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-15 15:51:39 +0300 |
| commit | e77040b2bf66128e1307b5ce0131d6f662c7f5fd (patch) | |
| tree | e65692a24f3eb45f1711872ce6c4e7cb0e2d6815 /newlib | |
| parent | eeded3c170799012406f84766b8905054f5a6902 (diff) | |
Add BSD guard for ino_t in <sys/types.h>
Introduce internal type __ino_t.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/libc/include/sys/_types.h | 9 | ||||
| -rw-r--r-- | newlib/libc/include/sys/types.h | 10 | ||||
| -rw-r--r-- | newlib/libc/sys/rtems/include/machine/_types.h | 3 |
3 files changed, 15 insertions, 7 deletions
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h index ce1aa7019..869c6a2fb 100644 --- a/newlib/libc/include/sys/_types.h +++ b/newlib/libc/include/sys/_types.h @@ -47,6 +47,15 @@ typedef unsigned short __gid_t; typedef __uint32_t __id_t; #endif +#ifndef __machine_ino_t_defined +#if (defined(__i386__) && (defined(GO32) || defined(__MSDOS__))) || \ + defined(__sparc__) || defined(__SPU__) +typedef unsigned long __ino_t; +#else +typedef unsigned short __ino_t; +#endif +#endif + #ifndef __machine_off64_t_defined __extension__ typedef long long _off64_t; #endif diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index d093578c7..2bf9eb54b 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -139,14 +139,10 @@ typedef __id_t id_t; /* can hold a uid_t or pid_t */ #define _ID_T_DECLARED #endif -#ifndef __CYGWIN__ -#if defined(__MS_types__) || defined(__rtems__) || \ - defined(__sparc__) || defined(__SPU__) -typedef unsigned long ino_t; -#else -typedef unsigned short ino_t; +#ifndef _INO_T_DECLARED +typedef __ino_t ino_t; /* inode number */ +#define _INO_T_DECLARED #endif -#endif /*__CYGWIN__*/ #ifdef __MS_types__ typedef unsigned long vm_offset_t; diff --git a/newlib/libc/sys/rtems/include/machine/_types.h b/newlib/libc/sys/rtems/include/machine/_types.h index f17d28139..76a684156 100644 --- a/newlib/libc/sys/rtems/include/machine/_types.h +++ b/newlib/libc/sys/rtems/include/machine/_types.h @@ -19,6 +19,9 @@ typedef __int32_t _off_t; typedef _off_t _fpos_t; #define __machine_fpos_t_defined +typedef unsigned long __ino_t; +#define __machine_ino_t_defined + typedef __uint32_t _mode_t; #define __machine_mode_t_defined |