From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 0FF87385624B; Tue, 10 May 2022 18:25:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FF87385624B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] socket: Use internal alias for __cmsg_nxthdr X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 9051963773db29cac83fe070499bed8a412f6680 X-Git-Newrev: 35e5a35db00a7eaa3e1c2bb31b496760b65b7849 Message-Id: <20220510182525.0FF87385624B@sourceware.org> Date: Tue, 10 May 2022 18:25:25 +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: Tue, 10 May 2022 18:25:25 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=35e5a35db00a7eaa3e1c2bb31b496760b65b7849 commit 35e5a35db00a7eaa3e1c2bb31b496760b65b7849 Author: Adhemerval Zanella Date: Thu Mar 17 08:16:41 2022 -0300 socket: Use internal alias for __cmsg_nxthdr Diff: --- include/sys/socket.h | 4 ++++ sysdeps/unix/sysv/linux/cmsg_nxthdr.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index f2525f4f3e..e3d855fab0 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -174,5 +174,9 @@ extern void __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) attribute_hidden; #endif +#undef CMSG_NXTHDR +#define CMSG_NXTHDR(mhdr, cmsg) __libc_cmsg_nxthdr (mhdr, cmsg) +hidden_proto2 (__cmsg_nxthdr, __libc_cmsg_nxthdr) + #endif #endif diff --git a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c index f3f5389b74..5d21ca7224 100644 --- a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c +++ b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c @@ -21,7 +21,7 @@ struct cmsghdr * -__cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg) +__libc_cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg) { if ((size_t) cmsg->cmsg_len < sizeof (struct cmsghdr)) /* The kernel header does this so there may be a reason. */ @@ -37,3 +37,5 @@ __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg) return NULL; return cmsg; } +libc_hidden_def (__libc_cmsg_nxthdr) +strong_alias (__libc_cmsg_nxthdr, __cmsg_nxthdr);