Re: MinGW build failure for GDB 8.2.90 with source-highlight

Eli Zaretskii
2019-03-12T15:49:24Z

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