public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES Date: Thu, 12 May 2022 19:38:30 +0000 (GMT) [thread overview] Message-ID: <20220512193830.8536B3839C7C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7f949067b426e81dbab40a580be3c2d0dae74db0 commit 7f949067b426e81dbab40a580be3c2d0dae74db0 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Thu Mar 31 10:58:56 2022 -0300 misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES Diff: --- include/sys/sysmacros.h | 16 +++++++++++++--- misc/makedev.c | 6 +++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index ae8d8f00da..d7d3f5d9c3 100644 --- a/include/sys/sysmacros.h +++ b/include/sys/sysmacros.h @@ -25,9 +25,12 @@ #if !defined _SYS_SYSMACROS_H_WRAPPER && !defined _ISOMAC # define _SYS_SYSMACROS_H_WRAPPER 1 -libc_hidden_proto (gnu_dev_major) -libc_hidden_proto (gnu_dev_minor) -libc_hidden_proto (gnu_dev_makedev) +__typeof (gnu_dev_major) __gnu_dev_major; +libc_hidden_proto (__gnu_dev_major) +__typeof (gnu_dev_minor) __gnu_dev_minor; +libc_hidden_proto (__gnu_dev_minor) +__typeof (gnu_dev_makedev) __gnu_dev_makedev; +libc_hidden_proto (__gnu_dev_makedev) # undef __SYSMACROS_DECL_TEMPL # define __SYSMACROS_DECL_TEMPL(rtype, name, proto) \ @@ -47,6 +50,13 @@ __SYSMACROS_DECLARE_MAKEDEV (__SYSMACROS_DECL_TEMPL) __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_IMPL_TEMPL) __SYSMACROS_DEFINE_MINOR (__SYSMACROS_IMPL_TEMPL) __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_IMPL_TEMPL) +# elif IS_IN (libc) +# undef major +# define major(dev) __gnu_dev_major (dev) +# undef minor +# define minor(dev) __gnu_dev_minor (dev) +# undef makedev +# define makedev(maj, min) __gnu_dev_makedev (maj, min) # endif #endif diff --git a/misc/makedev.c b/misc/makedev.c index 1629b80a26..c39c306206 100644 --- a/misc/makedev.c +++ b/misc/makedev.c @@ -27,10 +27,10 @@ __SYSMACROS_DEFINE_MAJOR(OUT_OF_LINE_IMPL_TEMPL) weak_alias (__gnu_dev_major, gnu_dev_major) -libc_hidden_weak (gnu_dev_major) +libc_hidden_weak (__gnu_dev_major) __SYSMACROS_DEFINE_MINOR(OUT_OF_LINE_IMPL_TEMPL) weak_alias (__gnu_dev_minor, gnu_dev_minor) -libc_hidden_weak (gnu_dev_minor) +libc_hidden_weak (__gnu_dev_minor) __SYSMACROS_DEFINE_MAKEDEV(OUT_OF_LINE_IMPL_TEMPL) weak_alias (__gnu_dev_makedev, gnu_dev_makedev) -libc_hidden_weak (gnu_dev_makedev) +libc_hidden_weak (__gnu_dev_makedev)
next reply other threads:[~2022-05-12 19:38 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-12 19:38 Adhemerval Zanella [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-06-09 21:25 Adhemerval Zanella 2022-06-09 13:21 Adhemerval Zanella 2022-06-03 14:10 Adhemerval Zanella 2022-05-13 14:24 Adhemerval Zanella 2022-05-10 18:28 Adhemerval Zanella 2022-04-29 14:08 Adhemerval Zanella 2022-04-04 12:59 Adhemerval Zanella 2022-03-31 19:11 Adhemerval Zanella
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=20220512193830.8536B3839C7C@sourceware.org \ --to=azanella@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).