i386/gnu/types.h moved to top-level linux dir.

diff --git a/sysdeps/unix/sysv/linux/gnu/types.h b/sysdeps/unix/sysv/linux/gnu/types.h
new file mode 100644 (file)
index 0000000..43264b5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/gnu/types.h
@@ -0,0 +1,88 @@
+/* Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef        _GNU_TYPES_H
+#define        _GNU_TYPES_H    1
+
+/* Convenience types.  */
+typedef unsigned char __u_char;
+typedef unsigned short __u_short;
+typedef unsigned int __u_int;
+typedef unsigned long __u_long;
+#ifdef __GNUC__
+typedef unsigned long long int __u_quad_t;
+typedef long long int __quad_t;
+typedef __quad_t *__qaddr_t;
+#else
+typedef struct
+{
+  long val[2];
+} __quad_t;
+typedef struct
+{
+  __u_long val[2];
+} __u_quad_t;
+#endif
+typedef unsigned short int __dev_t;    /* Type of device numbers.  */
+typedef unsigned short int __uid_t;    /* Type of user identifications.  */
+typedef unsigned short int __gid_t;    /* Type of group identifications.  */
+typedef unsigned long int __ino_t;     /* Type of file serial numbers.  */
+typedef unsigned short int __mode_t;   /* Type of file attribute bitmasks.  */
+typedef unsigned short int __nlink_t;  /* Type of file link counts.  */
+typedef long int __off_t;              /* Type of file sizes and offsets.  */
+typedef int __pid_t;                   /* Type of process identifications.  */
+typedef int __ssize_t;                 /* Type of a byte count, or error.  */
+#ifdef __GNUC__
+typedef long long int __fsid_t;                /* Type of file system IDs.  */
+#else
+typedef struct {                       /* Type of file system IDs.  */
+  long    val[2];
+} __fsid_t;
+#endif
+
+/* Everythin' else.  */
+typedef int __daddr_t;                 /* The type of a disk address.  */
+typedef char *__caddr_t;
+typedef long int __time_t;
+typedef long int __swblk_t;            /* Type of a swap block maybe?  */
+\f
+/* fd_set for select.  */
+
+/* Number of descriptors that can fit in an `fd_set'.  */
+#define        __FD_SETSIZE    256
+
+/* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
+#define        __NFDBITS       (sizeof (unsigned long int) * 8)
+#define        __FDELT(d)      ((d) / __NFDBITS)
+#define        __FDMASK(d)     (1 << ((d) % __NFDBITS))
+
+typedef struct
+  {
+    /* Some braindead old software uses this member name.  */
+    unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
+  } __fd_set;
+
+/* This line MUST be split!  Otherwise m4 will not change it.  */
+#define        __FD_ZERO(set)  \
+  ((void) memset ((__ptr_t) (set), 0, sizeof (fd_set)))
+#define        __FD_SET(d, set)        ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
+#define        __FD_CLR(d, set)        ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
+#define        __FD_ISSET(d, set)      ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
+
+
+#endif /* gnu/types.h */

diff --git a/sysdeps/unix/sysv/linux/i386/gnu/types.h b/sysdeps/unix/sysv/linux/i386/gnu/types.h
deleted file mode 100644 (file)
index 43264b5..0000000
--- a/sysdeps/unix/sysv/linux/i386/gnu/types.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#ifndef        _GNU_TYPES_H
-#define        _GNU_TYPES_H    1
-
-/* Convenience types.  */
-typedef unsigned char __u_char;
-typedef unsigned short __u_short;
-typedef unsigned int __u_int;
-typedef unsigned long __u_long;
-#ifdef __GNUC__
-typedef unsigned long long int __u_quad_t;
-typedef long long int __quad_t;
-typedef __quad_t *__qaddr_t;
-#else
-typedef struct
-{
-  long val[2];
-} __quad_t;
-typedef struct
-{
-  __u_long val[2];
-} __u_quad_t;
-#endif
-typedef unsigned short int __dev_t;    /* Type of device numbers.  */
-typedef unsigned short int __uid_t;    /* Type of user identifications.  */
-typedef unsigned short int __gid_t;    /* Type of group identifications.  */
-typedef unsigned long int __ino_t;     /* Type of file serial numbers.  */
-typedef unsigned short int __mode_t;   /* Type of file attribute bitmasks.  */
-typedef unsigned short int __nlink_t;  /* Type of file link counts.  */
-typedef long int __off_t;              /* Type of file sizes and offsets.  */
-typedef int __pid_t;                   /* Type of process identifications.  */
-typedef int __ssize_t;                 /* Type of a byte count, or error.  */
-#ifdef __GNUC__
-typedef long long int __fsid_t;                /* Type of file system IDs.  */
-#else
-typedef struct {                       /* Type of file system IDs.  */
-  long    val[2];
-} __fsid_t;
-#endif
-
-/* Everythin' else.  */
-typedef int __daddr_t;                 /* The type of a disk address.  */
-typedef char *__caddr_t;
-typedef long int __time_t;
-typedef long int __swblk_t;            /* Type of a swap block maybe?  */
-\f
-/* fd_set for select.  */
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define        __FD_SETSIZE    256
-
-/* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define        __NFDBITS       (sizeof (unsigned long int) * 8)
-#define        __FDELT(d)      ((d) / __NFDBITS)
-#define        __FDMASK(d)     (1 << ((d) % __NFDBITS))
-
-typedef struct
-  {
-    /* Some braindead old software uses this member name.  */
-    unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
-  } __fd_set;
-
-/* This line MUST be split!  Otherwise m4 will not change it.  */
-#define        __FD_ZERO(set)  \
-  ((void) memset ((__ptr_t) (set), 0, sizeof (fd_set)))
-#define        __FD_SET(d, set)        ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-#define        __FD_CLR(d, set)        ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-#define        __FD_ISSET(d, set)      ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
-
-
-#endif /* gnu/types.h */