From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id B6B4638344DB; Thu, 9 Jun 2022 13:21:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6B4638344DB 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] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: af4a0215c49b859948f3f2b51c6abb035d8b001c X-Git-Newrev: 45e9182843922ee087bda78fa2a5b4cd65a1c70c Message-Id: <20220609132135.B6B4638344DB@sourceware.org> Date: Thu, 9 Jun 2022 13:21:35 +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, 09 Jun 2022 13:21:35 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=45e9182843922ee087bda78fa2a5b4cd65a1c70c commit 45e9182843922ee087bda78fa2a5b4cd65a1c70c Author: Adhemerval Zanella 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)