From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8A59B3858C60 for ; Wed, 22 Dec 2021 15:07:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8A59B3858C60 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-zPwAgCsRM8eeO0OOcjNckg-1; Wed, 22 Dec 2021 10:07:35 -0500 X-MC-Unique: zPwAgCsRM8eeO0OOcjNckg-1 Received: by mail-ed1-f71.google.com with SMTP id dm10-20020a05640222ca00b003f808b5aa18so2089572edb.4 for ; Wed, 22 Dec 2021 07:07:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QCDglkAZTAovBbGP9A1fPls3/pdoe7m0t031yEmdNJE=; b=btwZCDH0o1REXo+iGSIAUbxelAOvvZFSQ5ZEv3ddFmDs/zs4VUS0awwq3ZK3vcq15n HN76z9g6KJntEsiYmS2ORBBm4IJC/VYXnhljJ8EeMktluSy2dNuTSO9YaU++wOgQEOBI o3fRLzI2M6+0RNw+7ehCXpH81In3XFW/lSOSIkUWkbVUxa4BfYZ5I3akF6O9Ozwi7MWq G/1FLavIKXRNX4QyWMEYLcHvz6PhUkJj8BZDWBojrMJyluun47/puTOxhKJ3qJPhak7E UXgcHfD9IR3gSc6ISTLqg6rgTT7LDlZcGR86xAG+4nMUb5O3kk1kcLEodJD1HZy3q0Ji NTfQ== X-Gm-Message-State: AOAM5306oZlMX4QutiVaDj/B/Xa01+S0NGtnCR6wxMVGzYEn6noDITvj h0jkUgffiYkvQM1zehYmpZBGzDpCM4OMl2qBJtvrFPuPChzvpkFn+7Uopwe4FdDmANB/QvmX7sP xYzPqbZlDMSWX43/yIwwens4s6O+qYlkdXaSE X-Received: by 2002:a05:6402:516a:: with SMTP id d10mr3339349ede.131.1640185654289; Wed, 22 Dec 2021 07:07:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBFc1uZTEdhj8geB7ZZqWTWJzWg43hh/HZ0oyXfA6qYRTEOF8hcZhem/KhvLfQ395vYsbXTbFXMq9j5O6x80Q= X-Received: by 2002:a05:6402:516a:: with SMTP id d10mr3339334ede.131.1640185654105; Wed, 22 Dec 2021 07:07:34 -0800 (PST) MIME-Version: 1.0 References: <87lf0dy0n0.fsf@autistici.org> In-Reply-To: From: Arjun Shankar Date: Wed, 22 Dec 2021 16:07:23 +0100 Message-ID: Subject: Re: [PATCH] intl/plural.y: define macros to avoid multiple conflicting declarations of yyerror and yylex To: Andrea Monaco Cc: libc-alpha@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2021 15:07:41 -0000 > diff --git a/intl/plural.y b/intl/plural.y > index e02e74541c..8573b56563 100644 > --- a/intl/plural.y > +++ b/intl/plural.y > @@ -40,6 +40,11 @@ > # define __gettextparse PLURAL_PARSE > #endif > > +/* Later we provide those prototypes. Without these macros, bison may > + generate its own prototypes with possible conflicts */ > +#define YYLEX_IS_DECLARED > +#define YYERROR_IS_DECLARED > + > %} > %parse-param {struct parse_args *arg} > %lex-param {struct parse_args *arg} > > OK. glibc uses double spaces at the end of a sentence in comments. > It's a minor edit and I'll make it before committing. > > Reviewed-by: Arjun Shankar I have now pushed this to master. I edited the commit message somewhat after using the one in your original email as a starting point. I hope it's okay. Cheers, Arjun