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

(u_short, u_int, u_long, caddr_t, daddr_t): Ditto.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index a61b6442f959b1ffd67d7f100dfe1172e21a9775..420a15ae48e9e2ee2ecbd94fb809c1e205d6fc8a 100644 (file)
--- 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 ba24929f384c784accd1fb24dcdf1471dba1976c..0627ca9fba9db127aafd24462a656f11e4986e79 100644 (file)
--- 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__) || \