Message ID | 83ef7c3xft.fsf@gnu.org |
---|---|
State | New, archived |
Headers |
Received: (qmail 80327 invoked by alias); 12 Mar 2019 15:49:24 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 80312 invoked by uid 89); 12 Mar 2019 15:49:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (209.51.188.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 12 Mar 2019 15:49:17 +0000 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>) id 1h3jeV-0003ap-JY; Tue, 12 Mar 2019 11:49:15 -0400 Received: from [176.228.60.248] (port=4592 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <eliz@gnu.org>) id 1h3jeV-0002eQ-0i; Tue, 12 Mar 2019 11:49:15 -0400 Date: Tue, 12 Mar 2019 17:49:10 +0200 Message-Id: <83ef7c3xft.fsf@gnu.org> From: Eli Zaretskii <eliz@gnu.org> To: Simon Marchi <simon.marchi@polymtl.ca> CC: gdb-patches@sourceware.org, palves@redhat.com In-reply-to: <ed82342fcc7e52f9ef3d3031aa69e793@polymtl.ca> (message from Simon Marchi on Mon, 11 Mar 2019 22:31:17 -0400) Subject: Re: MinGW build failure for GDB 8.2.90 with source-highlight References: <83r2bibvlv.fsf@gnu.org> <83ef7d5wak.fsf@gnu.org> <ed82342fcc7e52f9ef3d3031aa69e793@polymtl.ca> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-IsSubscribed: yes |
Commit Message
Eli Zaretskii
March 12, 2019, 3:49 p.m. UTC
> X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_MED, > URIBL_BLOCKED autolearn=disabled version=3.3.2 > Date: Mon, 11 Mar 2019 22:31:17 -0400 > From: Simon Marchi <simon.marchi@polymtl.ca> > Cc: gdb-patches@sourceware.org, Pedro Alves <palves@redhat.com> > > >> Perhaps we should simply #undef these two symbols before including > >> <fstream>? > > > > TIA > > If the change is localized in one or a handful of files, I think it > would be acceptable for the 8.3 release, since the alternative solution > would be (1) a lot of work and (2) risky. > > Can you post a patch that fixes the build for you? Sure, here it is:
Comments
On 2019-03-12 11:49, Eli Zaretskii wrote: >> X-Spam-Status: No, score=-1.5 required=5.0 >> tests=BAYES_50,RCVD_IN_DNSWL_MED, >> URIBL_BLOCKED autolearn=disabled version=3.3.2 >> Date: Mon, 11 Mar 2019 22:31:17 -0400 >> From: Simon Marchi <simon.marchi@polymtl.ca> >> Cc: gdb-patches@sourceware.org, Pedro Alves <palves@redhat.com> >> >> >> Perhaps we should simply #undef these two symbols before including >> >> <fstream>? >> > >> > TIA >> >> If the change is localized in one or a handful of files, I think it >> would be acceptable for the 8.3 release, since the alternative >> solution >> would be (1) a lot of work and (2) risky. >> >> Can you post a patch that fixes the build for you? > > Sure, here it is: > > diff --git a/gdb/source-cache.c b/gdb/source-cache.c > index 097c8a3..b98272c 100644 > --- a/gdb/source-cache.c > +++ b/gdb/source-cache.c > @@ -23,6 +23,8 @@ > #include "cli/cli-style.h" > > #ifdef HAVE_SOURCE_HIGHLIGHT > +#undef open > +#undef close > #include <fstream> > #include <sstream> > #include <srchilite/sourcehighlight.h> Thanks, this is fine with me, maybe with a comment explaining why it's needed. I also think you could push it to the master branch, so that it builds for mingw users. We will try to get the proper solution merged in the next release cycle, at which point we can remove this "hack". Simon
> Date: Tue, 12 Mar 2019 12:29:48 -0400 > From: Simon Marchi <simon.marchi@polymtl.ca> > Cc: gdb-patches@sourceware.org, palves@redhat.com > > > diff --git a/gdb/source-cache.c b/gdb/source-cache.c > > index 097c8a3..b98272c 100644 > > --- a/gdb/source-cache.c > > +++ b/gdb/source-cache.c > > @@ -23,6 +23,8 @@ > > #include "cli/cli-style.h" > > > > #ifdef HAVE_SOURCE_HIGHLIGHT > > +#undef open > > +#undef close > > #include <fstream> > > #include <sstream> > > #include <srchilite/sourcehighlight.h> > > Thanks, this is fine with me, maybe with a comment explaining why it's > needed. I also think you could push it to the master branch, so that it > builds for mingw users. Done, on both counts. Thanks for the review.
diff --git a/gdb/source-cache.c b/gdb/source-cache.c index 097c8a3..b98272c 100644 --- a/gdb/source-cache.c +++ b/gdb/source-cache.c @@ -23,6 +23,8 @@ #include "cli/cli-style.h" #ifdef HAVE_SOURCE_HIGHLIGHT +#undef open +#undef close #include <fstream> #include <sstream> #include <srchilite/sourcehighlight.h>