diff options
author | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:48:14 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:48:14 -0700 |
commit | 03af952060fee063679864d82cdd76f94d56d263 (patch) | |
tree | c5d020757b7fdb3e5d266bbc802e0f7f3798153c /ports | |
parent | c5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a (diff) | |
download | glibc-03af952060fee063679864d82cdd76f94d56d263.tar.gz glibc-03af952060fee063679864d82cdd76f94d56d263.tar.xz glibc-03af952060fee063679864d82cdd76f94d56d263.zip |
Clean up lockf64, fseeko64, ftello64, fgetpos64, fsetpos64 for off64_t == off_t.
Diffstat (limited to 'ports')
-rw-r--r-- | ports/ChangeLog.alpha | 5 | ||||
-rw-r--r-- | ports/ChangeLog.linux-generic | 5 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h | 6 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 7 |
4 files changed, 22 insertions, 1 deletions
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index b0d66edea7..b13857f92d 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,8 @@ +2012-08-02 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/alpha/bits/typesizes.h + (__OFF_T_MATCHES_OFF64_T): New macro. + 2012-08-03 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/alpha/configure.in diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic index 79d46129b3..b5774de5ff 100644 --- a/ports/ChangeLog.linux-generic +++ b/ports/ChangeLog.linux-generic @@ -1,3 +1,8 @@ +2012-08-02 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/generic/bits/typesizes.h + [__LP64__] (__OFF_T_MATCHES_OFF64_T): New macro. + 2012-05-30 Chris Metcalf <cmetcalf@tilera.com> * sysdeps/unix/sysv/linux/generic/syscalls.list: Remove diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h index 2dbeb42a17..31258e4205 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h @@ -1,5 +1,5 @@ /* bits/typesizes.h -- underlying types for *_t. Linux/Alpha version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -61,6 +61,10 @@ #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE #define __FSWORD_T_TYPE __S32_TYPE +/* 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 /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h index 948edeb96b..670c6d119f 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h @@ -62,6 +62,13 @@ #define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE #define __SYSCALL_ULONG_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 +#endif + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 |