From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id 1F4C23858031; Sat, 28 Aug 2021 00:40:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F4C23858031 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] Backport cl/98967227 to GRTE glibc 2.19 sources. X-Act-Checkin: glibc X-Git-Author: Brooks Moses X-Git-Refname: refs/heads/google/grte/v5-2.27/master X-Git-Oldrev: 31caad179bf541364f062312e34e6b584c067a92 X-Git-Newrev: 1a771e688fd70d331675f3641a2382fcc660e1a5 Message-Id: <20210828004038.1F4C23858031@sourceware.org> Date: Sat, 28 Aug 2021 00:40:38 +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: Sat, 28 Aug 2021 00:40:38 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1a771e688fd70d331675f3641a2382fcc660e1a5 commit 1a771e688fd70d331675f3641a2382fcc660e1a5 Author: Brooks Moses Date: Fri Aug 14 22:32:51 2015 -0700 Backport cl/98967227 to GRTE glibc 2.19 sources. Diff: --- elf/link.h | 8 ++++---- socket/sys/un.h | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/elf/link.h b/elf/link.h index c67a50dd8e..143d584db3 100644 --- a/elf/link.h +++ b/elf/link.h @@ -34,6 +34,8 @@ #include /* Defines __ELF_NATIVE_CLASS. */ #include +__BEGIN_DECLS + /* Rendezvous structure used by the run-time dynamic linker to communicate details of shared object loading to the debugger. If the executable's dynamic section has a DT_DEBUG element, the run-time linker sets that @@ -162,8 +164,6 @@ struct dl_phdr_info void *dlpi_tls_data; }; -__BEGIN_DECLS - extern int dl_iterate_phdr (int (*__callback) (struct dl_phdr_info *, size_t, void *), void *__data); @@ -187,8 +187,8 @@ extern uintptr_t la_symbind64 (Elf64_Sym *__sym, unsigned int __ndx, unsigned int *__flags, const char *__symname); extern unsigned int la_objclose (uintptr_t *__cookie); -__END_DECLS - #endif +__END_DECLS + #endif /* link.h */ diff --git a/socket/sys/un.h b/socket/sys/un.h index efc2194a3a..332ba0ecc7 100644 --- a/socket/sys/un.h +++ b/socket/sys/un.h @@ -23,6 +23,11 @@ /* Get the definition of the macro to define the common sockaddr members. */ #include +#ifdef __USE_MISC +# include /* For offsetof. */ +# include /* For prototype of `strlen'. */ +#endif + __BEGIN_DECLS /* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket. */ @@ -34,8 +39,6 @@ struct sockaddr_un #ifdef __USE_MISC -# include /* For prototype of `strlen'. */ - /* Evaluate to actual length of the `sockaddr_un' structure. */ # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + strlen ((ptr)->sun_path))