about summary refs log tree commit diff
path: root/socket
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2012-04-29 15:34:20 +0200
committerMarek Polacek <polacek@redhat.com>2012-04-29 15:34:20 +0200
commit5ac3ea17df811a71fa64aff78ea1b900facd3364 (patch)
tree47a842e0be1ca4d8c98ecc86d18330d61047560a /socket
parentecf0ebfb04f6e31e3ba709521b6955d5f86ff724 (diff)
downloadglibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.gz
glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.xz
glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.zip
Fix attributes for fortify functions.
Diffstat (limited to 'socket')
-rw-r--r--socket/bits/socket2.h6
-rw-r--r--socket/sys/socket.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h
index d12f06adf6..89a486464d 100644
--- a/socket/bits/socket2.h
+++ b/socket/bits/socket2.h
@@ -1,5 +1,5 @@
 /* Checking macros for socket functions.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ extern ssize_t __REDIRECT (__recv_chk_warn,
      __warnattr ("recv called with bigger length than size of destination "
 		 "buffer");
 
-__extern_always_inline ssize_t
+__fortify_function ssize_t
 recv (int __fd, void *__buf, size_t __n, int __flags)
 {
   if (__bos0 (__buf) != (size_t) -1)
@@ -60,7 +60,7 @@ extern ssize_t __REDIRECT (__recvfrom_chk_warn,
      __warnattr ("recvfrom called with bigger length than size of "
 		 "destination buffer");
 
-__extern_always_inline ssize_t
+__fortify_function ssize_t
 recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags,
 	  __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len)
 {
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index 556ae905f6..787c2b907e 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -246,7 +246,7 @@ extern int isfdtype (int __fd, int __fdtype) __THROW;
 
 
 /* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline
+#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
 # include <bits/socket2.h>
 #endif