* libc/include/sys/types.h (u_char): Add redefinition guard.

(u_short, u_int, u_long, caddr_t, daddr_t): Ditto.
This commit is contained in:
Yaakov Selkowitz 2013-07-05 21:46:10 +00:00
parent 0cbbf4c8bc
commit ddbe02c418
2 changed files with 23 additions and 0 deletions

View File

@ -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.

View File

@ -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__) || \