about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-07-16 18:11:48 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-16 18:11:48 +0000
commit06eee9f5f6e6911d6ded34eab033373057cfe16e (patch)
tree45f338afbed5fe3150a70c34448e38409e28eaf0 /sysdeps/unix/sysv/linux/i386
parentf17ed1a9ee9116a4792d22763a8c5912e5076473 (diff)
downloadglibc-06eee9f5f6e6911d6ded34eab033373057cfe16e.tar.gz
glibc-06eee9f5f6e6911d6ded34eab033373057cfe16e.tar.xz
glibc-06eee9f5f6e6911d6ded34eab033373057cfe16e.zip
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
-rw-r--r--sysdeps/unix/sysv/linux/i386/fcntl.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index 7787c5863b..210faba2a7 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -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)