diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2013-07-06 01:46:10 +0400 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2013-07-06 01:46:10 +0400 |
| commit | ddbe02c4185407c934c504b6c141bf924f4b4052 (patch) | |
| tree | 4f7145a5ab172df5bf7efba7ac9728ad6b6c5dce | |
| parent | 0cbbf4c8bcba07e54c266fd7a24bb1c6c1d4c438 (diff) | |
* libc/include/sys/types.h (u_char): Add redefinition guard.
(u_short, u_int, u_long, caddr_t, daddr_t): Ditto.
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/include/sys/types.h | 18 |
2 files changed, 23 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index a61b6442f..420a15ae4 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + + * libc/include/sys/types.h (u_char): Add redefinition guard. + (u_short, u_int, u_long, caddr_t, daddr_t): Ditto. + 2013-07-02 Joey Ye <joey.ye@arm.com> Lite exit support. diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index ba24929f3..0627ca9fb 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -89,10 +89,22 @@ typedef quad_t * qaddr_t; #ifndef _BSDTYPES_DEFINED /* also defined in mingw/gmon.h and in w32api/winsock[2].h */ +#ifndef __u_char_defined typedef unsigned char u_char; +#define __u_char_defined +#endif +#ifndef __u_short_defined typedef unsigned short u_short; +#define __u_short_defined +#endif +#ifndef __u_int_defined typedef unsigned int u_int; +#define __u_int_defined +#endif +#ifndef __u_long_defined typedef unsigned long u_long; +#define __u_long_defined +#endif #define _BSDTYPES_DEFINED #endif @@ -126,8 +138,14 @@ struct itimerspec { struct timespec it_value; /* Timer expiration */ }; +#ifndef __daddr_t_defined typedef long daddr_t; +#define __daddr_t_defined +#endif +#ifndef __caddr_t_defined typedef char * caddr_t; +#define __caddr_t_defined +#endif #ifndef __CYGWIN__ #if defined(__MS_types__) || defined(__rtems__) || \ |