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-09 17:20:48 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-09 17:20:48 +0000
commitd199bfb22296dbb3f0a17bfdde719a14da406ff1 (patch)
tree4b7385858315b23dff538bae553fafe1ce8e50c2 /sysdeps/unix/sysv/linux/i386
parent1b8cbd0847c4cbd319a8b3b706269a401940e2c4 (diff)
downloadglibc-d199bfb22296dbb3f0a17bfdde719a14da406ff1.tar.gz
glibc-d199bfb22296dbb3f0a17bfdde719a14da406ff1.tar.xz
glibc-d199bfb22296dbb3f0a17bfdde719a14da406ff1.zip
Update.
2004-07-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Move attribute
	to the front for gcc 3.5+.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Likewise.
	* include/fcntl.h: Don't declare __fcntl_nocancel here if
	NO_CANCELLATION is defined.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
-rw-r--r--sysdeps/unix/sysv/linux/i386/fcntl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index da65721ea2..7787c5863b 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -18,10 +18,10 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <sysdep-cancel.h>	/* Must come before <fcntl.h>.  */
 #include <fcntl.h>
 #include <stdarg.h>
 
-#include <sysdep-cancel.h>
 #include <sys/syscall.h>
 #include "../kernel-features.h"
 
@@ -31,10 +31,10 @@ int __have_no_fcntl64;
 #endif
 
 
-int
 #ifdef NO_CANCELLATION
 static inline __attribute ((always_inline))
 #endif
+int
 __fcntl_nocancel (int fd, int cmd, ...)
 {
   va_list ap;