Message ID | 20230319151017.531737-11-bugaevc@gmail.com |
---|---|
State | Committed, archived |
Headers |
Return-Path: <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 515D03847809 for <patchwork@sourceware.org>; Sun, 19 Mar 2023 15:12:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 515D03847809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679238743; bh=moP3xoYj0+2QqDc1A3bID12HT40vRAc8MAPLtFgsB5Q=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=WakYOPjEpJfYgUebFmjrTp/wSUPGI8HLkVq4M+pj3NUJUKZg8Lgb91NNZTtgSuGaX d9x9Ad947SOW2GC33dBNCCtUGJopw/iZDfT02wpLEPSWzq+hnHhevBmi6eWlgPFOA1 w/oU6A5wpxpBOuydP7jOMY8Zo6Z3Oxw1vLyCj8Sk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by sourceware.org (Postfix) with ESMTPS id 3042F385B800 for <libc-alpha@sourceware.org>; Sun, 19 Mar 2023 15:11:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3042F385B800 Received: by mail-lj1-x229.google.com with SMTP id e11so1053538lji.8 for <libc-alpha@sourceware.org>; Sun, 19 Mar 2023 08:11:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679238665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=moP3xoYj0+2QqDc1A3bID12HT40vRAc8MAPLtFgsB5Q=; b=hoHcd8NuGnoR+ijprNEugggNLVxL3JShPK4xywr0gk2X0yqED2KDhkT0TsVmZuvhc9 XCgFplnzInWMjB+qZh3MqRhHjpSshGVRZRIzbJeQzz6xNhMtuAEb6l9+X0VkGJP36Sz5 Uhd/r7EOJEyZGi4cMIwg5kG+7IsqtEW5/T4MmSO54kGLLrlU2KpcgWCrAYB41WyHlptr xoiElUMmcUORrwsAVTX5jNziPc7T9wNmGgeEboAeK4FerTXwvBzzVfDDSIfCzIWNVDNn PxwxYGFOvf8OEVKYwcJEUMbKGxEk2tvcQl9vQM+EV9MnIXk5Zf0m+5ZWdbi2vtU1gGdg Ticw== X-Gm-Message-State: AO0yUKX0cpk6Vs9V5+p0GQQaHRIuPIaah4GsCnVYaIs3yKF03xmMwbI5 6f7RQkfC34KM/yt7Hb9919d2f3OnjuDGow== X-Google-Smtp-Source: AK7set9v+0pBeLiv4lJOn535V9IzqbkHkLWwEfL0WrOJ9NJJvfZApnZG61ekOnYL9WP3q3rxdXHDtA== X-Received: by 2002:a2e:9019:0:b0:298:aee5:8f85 with SMTP id h25-20020a2e9019000000b00298aee58f85mr4838423ljg.46.1679238665478; Sun, 19 Mar 2023 08:11:05 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:577a:76f4:df43:5e66]) by smtp.gmail.com with ESMTPSA id m19-20020ac24253000000b004e90dee5469sm1274089lfl.157.2023.03.19.08.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 08:11:05 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault <samuel.thibault@gnu.org>, Sergey Bugaev <bugaevc@gmail.com> Subject: [RFC PATCH glibc 10/34] stdio-common: Fix building when !IS_IN (libc) Date: Sun, 19 Mar 2023 18:09:53 +0300 Message-Id: <20230319151017.531737-11-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230319151017.531737-1-bugaevc@gmail.com> References: <20230319151017.531737-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Sergey Bugaev via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Sergey Bugaev <bugaevc@gmail.com> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> |
Series |
The rest of the x86_64-gnu port
|
|
Checks
Context | Check | Description |
---|---|---|
dj/TryBot-apply_patch | success | Patch applied to master at the time it was sent |
Commit Message
Sergey Bugaev
March 19, 2023, 3:09 p.m. UTC
In this case, _itoa_word () is already defined inline in the header (see
sysdeps/generic/_itoa.h), and the second definition causes an error.
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
stdio-common/_itoa.c | 2 ++
1 file changed, 2 insertions(+)
Comments
Applied, thanks! Sergey Bugaev, le dim. 19 mars 2023 18:09:53 +0300, a ecrit: > In this case, _itoa_word () is already defined inline in the header (see > sysdeps/generic/_itoa.h), and the second definition causes an error. > > Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> > --- > stdio-common/_itoa.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c > index 27285193..3037b0f5 100644 > --- a/stdio-common/_itoa.c > +++ b/stdio-common/_itoa.c > @@ -157,6 +157,7 @@ const struct base_table_t _itoa_base_table[] attribute_hidden = > }; > #endif > > +#if IS_IN (libc) > char * > _itoa_word (_ITOA_WORD_TYPE value, char *buflim, > unsigned int base, int upper_case) > @@ -185,6 +186,7 @@ _itoa_word (_ITOA_WORD_TYPE value, char *buflim, > return buflim; > } > #undef SPECIAL > +#endif /* IS_IN (libc) */ > > > #if _ITOA_NEEDED > -- > 2.39.2 >
diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c index 27285193..3037b0f5 100644 --- a/stdio-common/_itoa.c +++ b/stdio-common/_itoa.c @@ -157,6 +157,7 @@ const struct base_table_t _itoa_base_table[] attribute_hidden = }; #endif +#if IS_IN (libc) char * _itoa_word (_ITOA_WORD_TYPE value, char *buflim, unsigned int base, int upper_case) @@ -185,6 +186,7 @@ _itoa_word (_ITOA_WORD_TYPE value, char *buflim, return buflim; } #undef SPECIAL +#endif /* IS_IN (libc) */ #if _ITOA_NEEDED