From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#48354: [PATCH] Fix compat with latest mingw64-headers Date: Tue, 11 May 2021 18:46:50 +0300 Message-ID: <83wns546j9.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26737"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 48354-done@debbugs.gnu.org To: Konstantin Shabanov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue May 11 17:47:25 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lgUbV-0006oP-KA for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 May 2021 17:47:25 +0200 Original-Received: from localhost ([::1]:53936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgUbU-0000LV-Gf for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 May 2021 11:47:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgUbA-0000Kc-4Z for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:47:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgUb8-0006KU-3l for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:47:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgUb8-0002R4-2H for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:47:02 -0400 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 11 May 2021 15:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 48354 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 48354@debbugs.gnu.org, eliz@gnu.org, mail@etehtsea.me Original-Received: via spool by 48354-done@debbugs.gnu.org id=D48354.16207480189347 (code D ref 48354); Tue, 11 May 2021 15:47:01 +0000 Original-Received: (at 48354-done) by debbugs.gnu.org; 11 May 2021 15:46:58 +0000 Original-Received: from localhost ([127.0.0.1]:37167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgUb4-0002Qh-7l for submit@debbugs.gnu.org; Tue, 11 May 2021 11:46:58 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgUb3-0002QM-8H for 48354-done@debbugs.gnu.org; Tue, 11 May 2021 11:46:57 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:53168) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgUav-0006GO-LA; Tue, 11 May 2021 11:46:51 -0400 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:4376 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgUar-00023e-SP; Tue, 11 May 2021 11:46:49 -0400 In-Reply-To: (message from Konstantin Shabanov on Tue, 11 May 2021 12:59:47 +0000) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:206255 Archived-At: > Date: Tue, 11 May 2021 12:59:47 +0000 > From: Konstantin Shabanov > > > [1:text/plain Hide] > > This commit to mingw-w64 broke compatibility with emacs-head because of the OS_NT conflict: > > In file included from w32image.c:32: > w32common.h:45:3: error: expected identifier before numeric constant > 45 | OS_NT > | ^~~~~ > > https://sourceforge.net/p/mingw-w64/mingw-w64/ci/dc7ef298837d4581200a3bed660aed36818c1b00/ > > The series of patches in attachments should fix the issue: > - the first one should cause the build to fail in the future instead of silent overriding definition; > - the second patch renames OS_9X to conform mingw-w64 naming; > - the third actually fixes build failure (preserving backward compatibility); Thanks, this is already fixed since 2 days ago on the emacs-27 branch, soon to be merged to master.