From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 313B9396E41C; Fri, 13 May 2022 14:24:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 313B9396E41C 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] stdlib: Handle bcrypt 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: cca1536fc2347d22466713374d6e8899eb794847 X-Git-Newrev: 7fe97df7a4f685253697a51167ddd6a3352c2fff Message-Id: <20220513142456.313B9396E41C@sourceware.org> Date: Fri, 13 May 2022 14:24:56 +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: Fri, 13 May 2022 14:24:56 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7fe97df7a4f685253697a51167ddd6a3352c2fff commit 7fe97df7a4f685253697a51167ddd6a3352c2fff Author: Adhemerval Zanella Date: Thu Mar 31 14:22:07 2022 -0300 stdlib: Handle bcrypt internal alias for !__USE_EXTERN_INLINES Diff: --- include/stdlib.h | 6 ++++++ stdlib/bsearch.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/include/stdlib.h b/include/stdlib.h index 6e09834909..754c8e4561 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -143,6 +143,12 @@ libc_hidden_proto (__ptsname_r) libc_hidden_proto (grantpt) libc_hidden_proto (unlockpt) +__typeof (bsearch) __bsearch; +libc_hidden_proto (__bsearch) +#if !defined __USE_EXTERN_INLINES && IS_IN(libc) +# define bsearch __bsearch +#endif + extern double __strtod_internal (const char *__restrict __nptr, char **__restrict __endptr, int __group) __THROW __nonnull ((1)) __wur; diff --git a/stdlib/bsearch.c b/stdlib/bsearch.c index ca643cb7f7..3311f7635a 100644 --- a/stdlib/bsearch.c +++ b/stdlib/bsearch.c @@ -19,4 +19,9 @@ #undef __extern_inline #define __extern_inline /* Empty, so we get a normal definition. */ +#undef bsearch +#define bsearch __bsearch #include +#undef bsearch +libc_hidden_def (__bsearch) +weak_alias (__bsearch, bsearch)