2002-06-21 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/math.h: Add <sys/types.h> to get _uint32_t definition.
        * libc/include/machine/types.h: Skip __off_t, __pid_t, and
        __loff_t definitions if special _HAVE_SYSTYPES macro defined.
        * libc/include/sys/config.h: Removed _uint*, _int* definitions.
        * libc/include/sys/param.h: Remove i386 case which is handled
        by default case.
        (BIG_ENDIAN, LITTLE_ENDIAN): Protect
        definitions in case they are already defined.
        (BYTE_ORDER): Add default case using _IEEE_BIG_ENDIAN and
        _IEEE_LITTLE_ENDIAN flags.
        * libc/include/sys/reent.h: Change __uint32_t references to
        use _ULong instead.
        (_REENT_GETDATE_REENT_P): New macro.
        * libc/include/sys/types.h (__int16_t, __uint16_t): Added.
        (__int32_t, __uint32_t, __int64_t, __uint64_t): Ditto.
        * libc/search/hash.h: Add default setting of BYTE_ORDER,
        LITTLE_ENDIAN, and BIG_ENDIAN, if not already defined.
        * libc/sys/linux/sys/types.h: Include <sys/_types.h>.  Define
        ssize_t based on _ssize_t.  Remove __socklen_t, __uintptr_t,
        pid_t, off_t, loff_t, caddr_t, and daddr_t type
        definitions which are done by subsequent glibc headers.
        Add macro definitions to prevent subsequent header files from
        defining pid_t, off_t, ssize_t, and key_t.  Move uintptr_t and
        intptr_t to after glibc definitions of types they are based on.

1 files changed, 12 insertions, 18 deletions

diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h
index bbc23167e..ec1761f42 100644
--- a/newlib/libc/sys/linux/sys/types.h
+++ b/newlib/libc/sys/linux/sys/types.h
@@ -52,6 +52,7 @@
 
 #include <sys/config.h>
 #include <machine/types.h>
+#include <sys/_types.h>
 
 #if !defined(__time_t_defined) && !defined(_TIME_T)
 #define _TIME_T
@@ -65,20 +66,12 @@ typedef _TIME_T_ time_t;
 typedef _CLOCK_T_ clock_t;
 #endif
 
-typedef unsigned int __socklen_t;
-typedef unsigned int __useconds_t;
-
-typedef __pid_t pid_t;
-typedef __off_t off_t;
-typedef __loff_t loff_t;
-typedef __uint32_t uintptr_t;
-typedef __int32_t intptr_t;
+#ifndef _SSIZE_T
+#define _SSIZE_T
+typedef _ssize_t ssize_t;
+#endif
 
 #ifndef __u_char_defined
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
 #ifdef __GNUC__
 __extension__ typedef long long quad_t;
 __extension__ typedef unsigned long long u_quad_t;
@@ -99,12 +92,6 @@ typedef struct
 #define __u_char_defined
 #endif
 
-#ifndef __daddr_t_defined
-typedef int daddr_t;
-typedef char *caddr_t;
-# define __daddr_t_defined
-#endif
-
 typedef int clockid_t;
 
 /* Time Value Specification Structures, P1003.1b-1993, p. 261 */
@@ -152,5 +139,12 @@ typedef	long	fd_mask;
 #define __mode_t_defined
 #define __gid_t_defined
 #define __uid_t_defined
+#define __pid_t_defined
+#define __ssize_t_defined
+#define __key_t_defined
+#define __off_t_defined
+
+typedef __uint32_t uintptr_t;
+typedef __int32_t intptr_t;
 
 #endif