From 5ac3ea17df811a71fa64aff78ea1b900facd3364 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Sun, 29 Apr 2012 15:34:20 +0200
Subject: Fix attributes for fortify functions.

---
 io/bits/fcntl2.h | 8 ++++----
 io/bits/poll2.h  | 4 ++--
 io/fcntl.h       | 2 +-
 io/sys/poll.h    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'io')

diff --git a/io/bits/fcntl2.h b/io/bits/fcntl2.h
index 09b81e6..76df18b 100644
--- a/io/bits/fcntl2.h
+++ b/io/bits/fcntl2.h
@@ -37,7 +37,7 @@ __errordecl (__open_too_many_args,
 __errordecl (__open_missing_mode,
 	     "open with O_CREAT in second argument needs 3 arguments");
 
-__extern_always_inline int
+__fortify_function int
 open (const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
@@ -69,7 +69,7 @@ __errordecl (__open64_too_many_args,
 __errordecl (__open64_missing_mode,
 	     "open64 with O_CREAT in second argument needs 3 arguments");
 
-__extern_always_inline int
+__fortify_function int
 open64 (const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
@@ -113,7 +113,7 @@ __errordecl (__openat_too_many_args,
 __errordecl (__openat_missing_mode,
 	     "openat with O_CREAT in third argument needs 4 arguments");
 
-__extern_always_inline int
+__fortify_function int
 openat (int __fd, const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
@@ -147,7 +147,7 @@ __errordecl (__openat64_too_many_args,
 __errordecl (__openat64_missing_mode,
 	     "openat64 with O_CREAT in third argument needs 4 arguments");
 
-__extern_always_inline int
+__fortify_function int
 openat64 (int __fd, const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
diff --git a/io/bits/poll2.h b/io/bits/poll2.h
index 862de28..404af1f 100644
--- a/io/bits/poll2.h
+++ b/io/bits/poll2.h
@@ -32,7 +32,7 @@ extern int __REDIRECT (__poll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
 		       __poll_chk)
   __warnattr ("poll called with fds buffer too small file nfds entries");
 
-__extern_always_inline int
+__fortify_function int
 poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
 {
   if (__bos (__fds) != (__SIZE_TYPE__) -1)
@@ -61,7 +61,7 @@ extern int __REDIRECT (__ppoll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
 		       __ppoll_chk)
   __warnattr ("ppoll called with fds buffer too small file nfds entries");
 
-__extern_always_inline int
+__fortify_function int
 ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout,
        const __sigset_t *__ss)
 {
diff --git a/io/fcntl.h b/io/fcntl.h
index 1192cf5..8b8726a 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -263,7 +263,7 @@ extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len);
 
 
 /* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline \
+#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \
     && defined __va_arg_pack_len
 # include <bits/fcntl2.h>
 #endif
diff --git a/io/sys/poll.h b/io/sys/poll.h
index 6089b61..9d78ff8 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -72,7 +72,7 @@ __END_DECLS
 
 
 /* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline
+#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
 # include <bits/poll2.h>
 #endif
 
-- 
cgit v1.1