Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / generic / bits / typesizes.h

diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
index b6541bbe27efeea7e795614c4b91a55d246fbf7c..05e3cfee4547947df4cf19f7e06f1cd8fad72a53 100644 (file)
--- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  For the generic Linux ABI.
-   Copyright (C) 2011-2012 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITS_TYPES_H
 # error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
@@ -45,20 +45,37 @@
 #define        __FSBLKCNT64_T_TYPE     __UQUAD_TYPE
 #define        __FSFILCNT_T_TYPE       __ULONGWORD_TYPE
 #define        __FSFILCNT64_T_TYPE     __UQUAD_TYPE
+#define        __FSWORD_T_TYPE         __SWORD_TYPE
 #define        __ID_T_TYPE             __U32_TYPE
 #define __CLOCK_T_TYPE         __SLONGWORD_TYPE
 #define __TIME_T_TYPE          __SLONGWORD_TYPE
 #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 *
 #define __BLKSIZE_T_TYPE       __S32_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
+#define __CPU_MASK_TYPE        __ULONGWORD_TYPE
+
+#ifdef __LP64__
+/* Tell the libc code that off_t and off64_t are actually the same type
+   for all ABI purposes, even if possibly expressed as different base types
+   for C type-checking purposes.  */
+# define __OFF_T_MATCHES_OFF64_T       1
+
+/* Same for ino_t and ino64_t.  */
+# define __INO_T_MATCHES_INO64_T       1
+
+/* And for __rlim_t and __rlim64_t.  */
+# define __RLIM_T_MATCHES_RLIM64_T     1
+#else
+# define __RLIM_T_MATCHES_RLIM64_T     0
+#endif
 
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define        __FD_SETSIZE            1024