public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Fangrui Song <maskray@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] Backport cl/98967227 to GRTE glibc 2.19 sources. Date: Sat, 28 Aug 2021 00:40:38 +0000 (GMT) [thread overview] Message-ID: <20210828004038.1F4C23858031@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1a771e688fd70d331675f3641a2382fcc660e1a5 commit 1a771e688fd70d331675f3641a2382fcc660e1a5 Author: Brooks Moses <bmoses@google.com> 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 <bits/elfclass.h> /* Defines __ELF_NATIVE_CLASS. */ #include <bits/link.h> +__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 <bits/sockaddr.h> +#ifdef __USE_MISC +# include <stddef.h> /* For offsetof. */ +# include <string.h> /* 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 <string.h> /* 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))
reply other threads:[~2021-08-28 0:40 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210828004038.1F4C23858031@sourceware.org \ --to=maskray@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).