Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Simon Marchi <simon.marchi@polymtl.ca>
Cc: gdb-patches@sourceware.org, palves@redhat.com
Subject: Re: MinGW build failure for GDB 8.2.90 with source-highlight
Date: Tue, 12 Mar 2019 15:49:00 -0000	[thread overview]
Message-ID: <83ef7c3xft.fsf@gnu.org> (raw)
In-Reply-To: <ed82342fcc7e52f9ef3d3031aa69e793@polymtl.ca> (message from Simon	Marchi on Mon, 11 Mar 2019 22:31:17 -0400)

> 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>


  parent reply	other threads:[~2019-03-12 15:49 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-07 14:36 Eli Zaretskii
2019-03-07 16:59 ` Simon Marchi
2019-03-07 17:11   ` Pedro Alves
2019-03-07 18:09     ` Simon Marchi
2019-03-07 18:20       ` Pedro Alves
2019-03-07 18:24         ` Simon Marchi
2019-03-07 20:29         ` Eli Zaretskii
2019-03-07 20:13   ` Eli Zaretskii
2019-03-11 14:18 ` Eli Zaretskii
2019-03-12  2:31   ` Simon Marchi
2019-03-12 10:52     ` Pedro Alves
2019-03-12 13:43       ` Simon Marchi
2019-03-12 15:49     ` Eli Zaretskii [this message]
2019-03-12 16:29       ` Simon Marchi
2019-03-12 17:53         ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83ef7c3xft.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=gdb-patches@sourceware.org \
    --cc=palves@redhat.com \
    --cc=simon.marchi@polymtl.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox