diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-04 19:29:27 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-04 19:29:27 +0000 |
| commit | a19eeb99758498e918043d50b57ba75b2d938e50 (patch) | |
| tree | 0b179455707ed727766787b7ef0d276d5d7dd315 /libc/socket/bits | |
| parent | ded28410835671021876e845572816d3083efe34 (diff) | |
Merge changes between r18165 and r18362 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18363 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/socket/bits')
| -rw-r--r-- | libc/socket/bits/socket2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/socket/bits/socket2.h b/libc/socket/bits/socket2.h index d12f06adf..89a486464 100644 --- a/libc/socket/bits/socket2.h +++ b/libc/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) { |