mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 06:10:10 +00:00
Linux: Fix fcntl, ioctl, prctl redirects for _TIME_BITS=64 (bug 28182)
__REDIRECT and __THROW are not compatible with C++ due to the ordering of the __asm__ alias and the throw specifier. __REDIRECT_NTH has to be used instead. Fixes commit8a40aff86b
("io: Add time64 alias for fcntl"), commit82c395d91e
("misc: Add time64 alias for ioctl"), commitb39ffab860
("Linux: Add time64 alias for prctl"). Reviewed-by: Carlos O'Donell <carlos@redhat.com> (cherry picked from commitc87fcacc50
)
This commit is contained in:
parent
9995d0588f
commit
31902ae639
7
NEWS
7
NEWS
@ -4,6 +4,13 @@ See the end for copying conditions.
|
||||
|
||||
Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
|
||||
using `glibc' in the "product" field.
|
||||
|
||||
Version 2.34.1
|
||||
|
||||
The following bugs are resolved with this release:
|
||||
|
||||
[28182] _TIME_BITS=64 in C++ has issues with fcntl, ioctl, prctl
|
||||
|
||||
|
||||
Version 2.34
|
||||
|
||||
|
@ -187,10 +187,10 @@ extern int fcntl64 (int __fd, int __cmd, ...);
|
||||
# endif
|
||||
#else /* __USE_TIME_BITS64 */
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (fcntl, (int __fd, int __request, ...),
|
||||
__fcntl_time64) __THROW;
|
||||
extern int __REDIRECT (fcntl64, (int __fd, int __request, ...),
|
||||
__fcntl_time64) __THROW;
|
||||
extern int __REDIRECT_NTH (fcntl, (int __fd, int __request, ...),
|
||||
__fcntl_time64);
|
||||
extern int __REDIRECT_NTH (fcntl64, (int __fd, int __request, ...),
|
||||
__fcntl_time64);
|
||||
# else
|
||||
extern int __fcntl_time64 (int __fd, int __request, ...) __THROW;
|
||||
# define fcntl64 __fcntl_time64
|
||||
|
@ -42,8 +42,8 @@ __BEGIN_DECLS
|
||||
extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
|
||||
#else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (ioctl, (int __fd, unsigned long int __request, ...),
|
||||
__ioctl_time64) __THROW;
|
||||
extern int __REDIRECT_NTH (ioctl, (int __fd, unsigned long int __request, ...),
|
||||
__ioctl_time64);
|
||||
# else
|
||||
extern int __ioctl_time64 (int __fd, unsigned long int __request, ...) __THROW;
|
||||
# define ioctl __ioctl_time64
|
||||
|
@ -42,7 +42,7 @@ __BEGIN_DECLS
|
||||
extern int prctl (int __option, ...) __THROW;
|
||||
#else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (prctl, (int __option, ...), __prctl_time64) __THROW;
|
||||
extern int __REDIRECT_NTH (prctl, (int __option, ...), __prctl_time64);
|
||||
# else
|
||||
extern int __prctl_time64 (int __option,d ...) __THROW;
|
||||
# define ioctl __prctl_time64
|
||||
|
Loading…
Reference in New Issue
Block a user