Get rid of unused __swblk_t type.

diff --git a/ChangeLog b/ChangeLog
index 83a0349843d5d5c67e1b4dfb13833e7314a1eacb..f5183fac7a4834d69f0b4df02894852cbe1b021e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-10-01  Roland McGrath  <roland@hack.frob.com>
+
+       * bits/types.h (__swblk_t): Type removed.
+       * bits/typesizes.h (__SWBLK_T_TYPE): Macro removed.
+       * sysdeps/mach/hurd/bits/typesizes.h (__SWBLK_T_TYPE): Likewise.
+       * sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+       (__SWBLK_T_TYPE): Likewise.
+       * sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+       (__SWBLK_T_TYPE): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+       (__SWBLK_T_TYPE): Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+       (__SWBLK_T_TYPE): Likewise.
+
 2012-10-01  Patsy Franklin <pfrankli@redhat.com>
             Honza Horak <hhorak@redhat.com>
 

diff --git a/bits/types.h b/bits/types.h
index 041ace63165e3d3253fb170e5dab4594dc99eaba..51ef89b7a4581cb31b00507848d595b7101183c8 100644 (file)
--- a/bits/types.h
+++ b/bits/types.h
@@ -150,7 +150,6 @@ __STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds.  */
 __STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds.  */
 
 __STD_TYPE __DADDR_T_TYPE __daddr_t;   /* The type of a disk address.  */
-__STD_TYPE __SWBLK_T_TYPE __swblk_t;   /* Type of a swap block maybe?  */
 __STD_TYPE __KEY_T_TYPE __key_t;       /* Type of an IPC key.  */
 
 /* Clock ID used in clock and timer functions.  */

diff --git a/bits/typesizes.h b/bits/typesizes.h
index c3debd0dd634cbb5fbd156a9e494868d0c33b8a1..ac18c8199e28c234a353b41cd9a3f61b8ca7c56f 100644 (file)
--- a/bits/typesizes.h
+++ b/bits/typesizes.h
@@ -51,7 +51,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 672ab652c0941374de8cc1deb6fea897731bb57b..2b34cabc611517003047be86bc411d2d0d625aaa 100644 (file)
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-10-01  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
+       (__SWBLK_T_TYPE): Macro removed.
+
 2012-09-28  Richard Henderson  <rth@redhat.com>
 
        * sysdeps/unix/alpha/sysdep.h (PSEUDO_END): Merge versions and

diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic
index b5774de5ffa990c05fd022aa2c6eac1c3bf4b504..efbf3992af0014e891c885d27ab2d83e300e7649 100644 (file)
--- a/ports/ChangeLog.linux-generic
+++ b/ports/ChangeLog.linux-generic
@@ -1,3 +1,8 @@
+2012-10-01  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+       (__SWBLK_T_TYPE): Macro removed.
+
 2012-08-02  Roland McGrath  <roland@hack.frob.com>
 
        * sysdeps/unix/sysv/linux/generic/bits/typesizes.h

diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
index 31258e420540393f9027a34ca1dca0e982ad17c7..5ab9ac43a324d988d219385fb25fce1196c5f137 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
@@ -50,7 +50,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __S64_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *

diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
index d7d2a5c10dc2418119de490671bfb9e21f9e6e86..d5799d1851923501c63c0dcf6ac163ad55a075b8 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
@@ -52,7 +52,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *

diff --git a/sysdeps/mach/hurd/bits/typesizes.h b/sysdeps/mach/hurd/bits/typesizes.h
index efc13143e72b21f3dc259d7973051e36e4da9727..af132669ff0920b740676fbe6e8720beedcd048c 100644 (file)
--- a/sysdeps/mach/hurd/bits/typesizes.h
+++ b/sysdeps/mach/hurd/bits/typesizes.h
@@ -51,7 +51,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         __S32_TYPE

diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
index 67d82e6e75078b69ba37b83824c1ee45b55e5491..0714ed02b54fd1756118d3684d4767e81fa4344d 100644 (file)
--- a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+++ b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
@@ -51,7 +51,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __S32_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         __S32_TYPE

diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
index b63048840680e8fd1b5083d7f8ec71c9c410ce2c..ee7e22b635e1354ba069c723e7f345c562e8de4a 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
@@ -51,7 +51,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
index e55d642e74c58dcd6d84b5d6a73ca6c86ad20550..8be55a8d7ca51fae50725e19af25a3a8a6db0430 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
@@ -51,7 +51,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __S32_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SLONGWORD_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *

diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
index 397e867245d1a75af71e0b2388efddd3a0ccd49b..ebb5bbb645a51c79e7ac1126e145479a7ca98583 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
@@ -65,7 +65,6 @@
 #define __USECONDS_T_TYPE      __U32_TYPE
 #define __SUSECONDS_T_TYPE     __SYSCALL_SLONG_TYPE
 #define __DADDR_T_TYPE         __S32_TYPE
-#define __SWBLK_T_TYPE         __SYSCALL_SLONG_TYPE
 #define __KEY_T_TYPE           __S32_TYPE
 #define __CLOCKID_T_TYPE       __S32_TYPE
 #define __TIMER_T_TYPE         void *