From patchwork Tue Mar 12 15:49:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Zaretskii X-Patchwork-Id: 31823 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: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , 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 ) 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 ) 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 To: Simon Marchi CC: gdb-patches@sourceware.org, palves@redhat.com In-reply-to: (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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-IsSubscribed: yes > 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 > Cc: gdb-patches@sourceware.org, Pedro Alves > > >> Perhaps we should simply #undef these two symbols before including > >> ? > > > > 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 #include #include