* sysdeps/unix/sysv/linux/bits/ustat.h: Moved to ...

	* sysdeps/generic/bits/ustat.h: ... here (was almost identical).

4 files changed, 19 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index f022b32765..b49b6fb82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-15  Roland McGrath  <roland@frob.com>
 
+	* sysdeps/unix/sysv/linux/bits/ustat.h: Moved to ...
+	* sysdeps/generic/bits/ustat.h: ... here (was almost identical).
+
 	* sysdeps/alpha/divrem.h: Use local label instead of global one for
 	jump to local subroutine.
 
diff --git a/bits/ustat.h b/bits/ustat.h
index 7925b9aa8e..aeafc22a5c 100644
--- a/bits/ustat.h
+++ b/bits/ustat.h
@@ -1,5 +1,4 @@
-/* Generic declaration of ustat structure.
-   Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997 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
@@ -17,14 +16,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-__BEGIN_DECLS
+#include <sys/types.h>
 
 struct ustat
-{
-  __daddr_t f_tfree;	/* total free */
-  __ino_t f_tinode;	/* total inodes free */
-  char f_fname[6];	/* filesystem name */
-  char f_fpack[6];	/* filesystem pack name */
-};
-
-__END_DECLS
+  {
+    __daddr_t f_tfree;
+    __ino_t f_tinode;
+    char f_fname[6];
+    char f_fpack[6];
+  };
diff --git a/sysdeps/generic/bits/ustat.h b/sysdeps/generic/bits/ustat.h
index 7925b9aa8e..aeafc22a5c 100644
--- a/sysdeps/generic/bits/ustat.h
+++ b/sysdeps/generic/bits/ustat.h
@@ -1,5 +1,4 @@
-/* Generic declaration of ustat structure.
-   Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997 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
@@ -17,14 +16,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-__BEGIN_DECLS
+#include <sys/types.h>
 
 struct ustat
-{
-  __daddr_t f_tfree;	/* total free */
-  __ino_t f_tinode;	/* total inodes free */
-  char f_fname[6];	/* filesystem name */
-  char f_fpack[6];	/* filesystem pack name */
-};
-
-__END_DECLS
+  {
+    __daddr_t f_tfree;
+    __ino_t f_tinode;
+    char f_fname[6];
+    char f_fpack[6];
+  };
diff --git a/sysdeps/unix/sysv/linux/bits/ustat.h b/sysdeps/unix/sysv/linux/bits/ustat.h
deleted file mode 100644
index aeafc22a5c..0000000000
--- a/sysdeps/unix/sysv/linux/bits/ustat.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1997 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/types.h>
-
-struct ustat
-  {
-    __daddr_t f_tfree;
-    __ino_t f_tinode;
-    char f_fname[6];
-    char f_fpack[6];
-  };