about summary refs log tree commit diff
path: root/misc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-08-06 09:51:38 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-08-06 09:52:00 +0200
commitc87fcacc50505d550f1bb038382bcc7ea73a5926 (patch)
treed14fd134913f22cf9ec2f9023fe5fed57fbcfe8b /misc
parentfb89489636766532902d4a02a08dbb72efed4faf (diff)
downloadglibc-c87fcacc50505d550f1bb038382bcc7ea73a5926.tar.gz
glibc-c87fcacc50505d550f1bb038382bcc7ea73a5926.tar.xz
glibc-c87fcacc50505d550f1bb038382bcc7ea73a5926.zip
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 commit 8a40aff86ba5f64a3a84883e539cb67b ("io: Add time64 alias
for fcntl"), commit 82c395d91ea4f69120d453aeec398e30 ("misc: Add
time64 alias for ioctl"), commit b39ffab860cd743a82c91946619f1b8158
("Linux: Add time64 alias for prctl").

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/sys/ioctl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h
index 6884d9925f..9945c1e918 100644
--- a/misc/sys/ioctl.h
+++ b/misc/sys/ioctl.h
@@ -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