From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id DEB403AA941B; Thu, 15 Jul 2021 08:10:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEB403AA941B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] socket: Add hidden prototype for setsockopt X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: ba33937be210da5d07f7f01709323743f66011ce X-Git-Newrev: b8f889064d02cedc90a109848190207a767a4913 Message-Id: <20210715081009.DEB403AA941B@sourceware.org> Date: Thu, 15 Jul 2021 08:10:09 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 08:10:10 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b8f889064d02cedc90a109848190207a767a4913 commit b8f889064d02cedc90a109848190207a767a4913 Author: Florian Weimer Date: Thu Jul 15 08:28:50 2021 +0200 socket: Add hidden prototype for setsockopt Reviewed-by: Adhemerval Zanella Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- include/sys/socket.h | 3 ++- sysdeps/mach/hurd/setsockopt.c | 2 +- sysdeps/unix/sysv/linux/setsockopt.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index 38a1f76b3b..a1d749f9fa 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -118,7 +118,8 @@ libc_hidden_proto (__recvmmsg64) Returns 0 on success, -1 for errors. */ extern int __setsockopt (int __fd, int __level, int __optname, const void *__optval, - socklen_t __optlen) attribute_hidden; + socklen_t __optlen); +libc_hidden_proto (__setsockopt) /* Put the current value for socket FD's option OPTNAME at protocol level LEVEL into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's diff --git a/sysdeps/mach/hurd/setsockopt.c b/sysdeps/mach/hurd/setsockopt.c index 283af7114c..165c085599 100644 --- a/sysdeps/mach/hurd/setsockopt.c +++ b/sysdeps/mach/hurd/setsockopt.c @@ -38,5 +38,5 @@ __setsockopt (int fd, return __hurd_dfail (fd, err); return 0; } - +libc_hidden_def (__setsockopt) weak_alias (__setsockopt, setsockopt) diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c index 2792f1b5a1..bb3017f89c 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c +++ b/sysdeps/unix/sysv/linux/setsockopt.c @@ -90,7 +90,7 @@ setsockopt32 (int fd, int level, int optname, const void *optval, #endif int -setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) +__setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) { int r = setsockopt_syscall (fd, level, optname, optval, len); @@ -101,4 +101,5 @@ setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) return r; } -weak_alias (setsockopt, __setsockopt) +libc_hidden_def (__setsockopt) +weak_alias (__setsockopt, setsockopt)