From d199bfb22296dbb3f0a17bfdde719a14da406ff1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 9 Jul 2004 17:20:48 +0000
Subject: 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.
---
 sysdeps/unix/sysv/linux/fcntl.c                   | 4 ++--
 sysdeps/unix/sysv/linux/i386/fcntl.c              | 4 ++--
 sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysdeps/unix')

diff --git a/sysdeps/unix/sysv/linux/fcntl.c b/sysdeps/unix/sysv/linux/fcntl.c
index ab8d9cfb9c..87fa2ffe31 100644
--- a/sysdeps/unix/sysv/linux/fcntl.c
+++ b/sysdeps/unix/sysv/linux/fcntl.c
@@ -18,17 +18,17 @@
 
 #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>
 
 
-int
 #ifdef NO_CANCELLATION
 static inline __attribute ((always_inline))
 #endif
+int
 __fcntl_nocancel (int fd, int cmd, ...)
 {
   va_list ap;
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;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
index 4b60a163ce..95b817bc40 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
@@ -18,17 +18,17 @@
 
 #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>
 
 
-int
 #ifdef NO_CANCELLATION
 static inline __attribute ((always_inline))
 #endif
+int
 __fcntl_nocancel (int fd, int cmd, ...)
 {
   va_list ap;
-- 
cgit 1.4.1