From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id BF91E1F8C6 for ; Sun, 20 Jun 2021 14:31:51 +0000 (UTC) Received: from localhost ([::1]:57744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luyUI-0001Bq-KL for normalperson@yhbt.net; Sun, 20 Jun 2021 10:31:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luyUF-0001Bh-Bo for bug-gnulib@gnu.org; Sun, 20 Jun 2021 10:31:47 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.22]:23649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luyUD-0005FU-CQ for bug-gnulib@gnu.org; Sun, 20 Jun 2021 10:31:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1624199501; s=strato-dkim-0002; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=R70AmunXDJo7BBr2itxLPKGLIah55KDwFLk8IPzDUMI=; b=lpuOvXnlRAUDya5o/7joNzES7AiSVsORpBwhKmx8KQmIMZ+DeTXD7/Paqwi69duSTR pewXAzTqOIjNsYAyCCDji+3JNUQQYp9OJPpaxqLqw5+HbibNJFRcWCMQFKgbJ1QnPgPW C9uH6PwSt3lKxG/8uu7T5MWyRFsjF0kHzaFsGlXh6HUPDhdjyiKAmN2sqBqgt9AN2ANG c3ZRrtCaxZqp/aoEI0BIPDNKqZsUXctPdeBqeOVxJRBKHEvNIRJAHxK/LuG3tl5HdpZ9 0PrKxuwD4eJ908Er2zAGKm87KvXfWDmHiuPMDGc/iTZxSj8j+HUJZ79T30vsCG/+HzSX 0d7w== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOGKf9yfs=" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 47.27.3 DYNA|AUTH) with ESMTPSA id 401b97x5KEVf8wx (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Sun, 20 Jun 2021 16:31:41 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: Re: sync with GNU gettext Date: Sun, 20 Jun 2021 16:31:40 +0200 Message-ID: <6372564.xzthJLXbDh@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-210-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <1874298.jdjunOyti0@omega> References: <1874298.jdjunOyti0@omega> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=85.215.255.22; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" > 2021-06-19 Bruno Haible > > Sync with GNU gettext. > * lib/tsearch.c: Ignore IN_LIBINTL. > * lib/localename-table.h: Likewise. > * lib/localename.c: Ignore IN_LIBINTL in some places. Some more simplifications of the same kind: 2021-06-20 Bruno Haible Sync with GNU gettext. * lib/printf-parse.c: Ignore IN_LIBINTL and IN_LIBASPRINTF. * lib/vasnprintf.c: Ignore IN_LIBINTL. diff --git a/lib/printf-parse.c b/lib/printf-parse.c index d9dd6e0..f21cc17 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -48,16 +48,7 @@ #include /* Get intmax_t. */ -#if defined IN_LIBINTL || defined IN_LIBASPRINTF -# if HAVE_STDINT_H_WITH_UINTMAX -# include -# endif -# if HAVE_INTTYPES_H_WITH_UINTMAX -# include -# endif -#else -# include -#endif +#include /* malloc(), realloc(), free(). */ #include diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 089c113..12c532e 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -60,9 +60,7 @@ #ifndef VASNPRINTF # include #endif -#ifndef IN_LIBINTL -# include -#endif +#include /* Specification. */ #ifndef VASNPRINTF