Remove __snseconds_t

diff --git a/ChangeLog b/ChangeLog
index 724d73f517d5beb3fd947d6a5fbfbceaccb71049..615ea849c1997f3a5aea633c6537ea19195d2e5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * bits/types.h (__snseconds_t): Removed.
+       * time/time.h (struct timespec): Replace __snseconds_t with
+       __syscall_slong_t.
+       * bits/typesizes.h (__SNSECONDS_T_TYPE): Removed.
+       * sysdeps/mach/hurd/bits/typesizes.h (__SNSECONDS_T_TYPE):
+       Likewise.
+       * sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+       (__SNSECONDS_T_TYPE): Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+       (__SNSECONDS_T_TYPE): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+       (__SNSECONDS_T_TYPE): Likewise.
+
 2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/mach/hurd/bits/typesizes.h

diff --git a/bits/types.h b/bits/types.h
index 34880a926f1f1532aaeb8327804b3f47ef3a1bca..270b656407694cc63d124ee06a45634edd267b6a 100644 (file)
--- a/bits/types.h
+++ b/bits/types.h
@@ -1,5 +1,6 @@
 /* bits/types.h -- definitions of __*_t types underlying *_t types.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2012
+   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
@@ -148,7 +149,6 @@ __STD_TYPE __ID_T_TYPE __id_t;              /* General type for IDs.  */
 __STD_TYPE __TIME_T_TYPE __time_t;     /* Seconds since the Epoch.  */
 __STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds.  */
 __STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds.  */
-__STD_TYPE __SNSECONDS_T_TYPE __snseconds_t; /* Signed count of nanoseconds.  */
 
 __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?  */

diff --git a/bits/typesizes.h b/bits/typesizes.h
index b0f284be28c0141ea3787b61f1598275cf15b741..bdd040b5b53ba088ca93165fa2d00bef6ef43acf 100644 (file)
--- a/bits/typesizes.h
+++ b/bits/typesizes.h
@@ -1,5 +1,6 @@
 /* bits/typesizes.h -- underlying types for *_t.  Generic version.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2012
+   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
@@ -57,7 +58,6 @@
 #define __BLKSIZE_T_TYPE       __SLONGWORD_TYPE
 #define __FSID_T_TYPE          struct { int __val[2]; }
 #define __SSIZE_T_TYPE         __SWORD_TYPE
-#define __SNSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __SYSCALL_SLONG_TYPE   __SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE   __ULONGWORD_TYPE
 

diff --git a/sysdeps/mach/hurd/bits/typesizes.h b/sysdeps/mach/hurd/bits/typesizes.h
index e138175bb5c0d49e725953d6da135c3e1eb0f72e..594ea7d854583fe695cbf8002cc3756079a096e6 100644 (file)
--- a/sysdeps/mach/hurd/bits/typesizes.h
+++ b/sysdeps/mach/hurd/bits/typesizes.h
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  Hurd version.
-   Copyright (C) 2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 2002,2003,2012 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
@@ -57,7 +57,6 @@
 #define __BLKSIZE_T_TYPE       __SLONGWORD_TYPE
 #define __FSID_T_TYPE          __UQUAD_TYPE
 #define __SSIZE_T_TYPE         __SWORD_TYPE
-#define __SNSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __SYSCALL_SLONG_TYPE   __SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE   __ULONGWORD_TYPE
 

diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
index f860e3422fd03dc9b09aa4c381af0af5a125d797..77b2b3b3744cd7714505ca864dbc42e82d1a5d71 100644 (file)
--- a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+++ b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  FreeBSD version.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2012 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
@@ -57,7 +57,6 @@
 #define __BLKSIZE_T_TYPE       __U32_TYPE
 #define __FSID_T_TYPE          struct { int __val[2]; }
 #define __SSIZE_T_TYPE         __SWORD_TYPE
-#define __SNSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __SYSCALL_SLONG_TYPE   __SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE   __ULONGWORD_TYPE
 

diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
index 4b9bfca7f055706fae3ec4fec31d073976551336..8ac715cdf638f703dab3ef6c547dfbc909bf7a2d 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  Linux/s390 version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2012 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
@@ -63,7 +63,6 @@
 /* size_t is unsigned long int on s390 -m31.  */
 #define __SSIZE_T_TYPE         __SLONGWORD_TYPE
 #endif
-#define __SNSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __SYSCALL_SLONG_TYPE   __SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE   __ULONGWORD_TYPE
 

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
index 254b3047d7aec6277e1e25a8c4a00bd4e4fbe0a1..acb2c414cbf06aa83003b319df17d045eb93c6ab 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  Linux/SPARC version.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2012 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
@@ -57,7 +57,6 @@
 #define __BLKSIZE_T_TYPE       __SLONGWORD_TYPE
 #define __FSID_T_TYPE          struct { int __val[2]; }
 #define __SSIZE_T_TYPE         __SWORD_TYPE
-#define __SNSECONDS_T_TYPE     __SLONGWORD_TYPE
 #define __SYSCALL_SLONG_TYPE   __SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE   __ULONGWORD_TYPE
 

diff --git a/time/time.h b/time/time.h
index 776dc401ad3fd89776e3a31951c9ec2f2e9e087f..62562648927c03f0dd8c001ca848d75fdee91c4c 100644 (file)
--- a/time/time.h
+++ b/time/time.h
@@ -120,7 +120,7 @@ typedef __timer_t timer_t;
 struct timespec
   {
     __time_t tv_sec;           /* Seconds.  */
-    __snseconds_t tv_nsec;     /* Nanoseconds.  */
+    __syscall_slong_t tv_nsec; /* Nanoseconds.  */
   };
 
 #endif /* timespec not defined and <time.h> or need timespec.  */