mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Remove static inline __attribute ((always_inline)). Don't define if NO_CANCELLATION. (__libc_fcntl): Use INLINE_SYSCALL directly instead of __fcntl_nocancel. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c (__fcntl_nocancel): Remove static inline __attribute ((always_inline)). Don't define if NO_CANCELLATION. (__libc_fcntl): Use INLINE_SYSCALL directly instead of __fcntl_nocancel. * sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Define to __libc_fcntl if NO_CANCELLATION and __ASSUME_FCNTL64 == 0. Don't define at all if NO_CANCELLATION and __ASSUME_FCNTL64 > 0. (__libc_fcntl): Don't define if __fcntl_nocancel is a macro.
This commit is contained in:
@ -30,10 +30,11 @@
|
||||
int __have_no_fcntl64;
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef NO_CANCELLATION
|
||||
static inline __attribute ((always_inline))
|
||||
#if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0
|
||||
# define __fcntl_nocancel __libc_fcntl
|
||||
#endif
|
||||
|
||||
#if !defined NO_CANCELLATION || __ASSUME_FCNTL64 == 0
|
||||
int
|
||||
__fcntl_nocancel (int fd, int cmd, ...)
|
||||
{
|
||||
@ -126,8 +127,10 @@ __fcntl_nocancel (int fd, int cmd, ...)
|
||||
return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
|
||||
#endif /* !__ASSUME_FCNTL64 */
|
||||
}
|
||||
#endif /* NO_CANCELLATION || !__ASSUME_FCNTL64 */
|
||||
|
||||
|
||||
#ifndef __fcntl_nocancel
|
||||
int
|
||||
__libc_fcntl (int fd, int cmd, ...)
|
||||
{
|
||||
@ -158,6 +161,7 @@ __libc_fcntl (int fd, int cmd, ...)
|
||||
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
libc_hidden_def (__libc_fcntl)
|
||||
|
||||
weak_alias (__libc_fcntl, __fcntl)
|
||||
|
Reference in New Issue
Block a user