bug#48354: closed ([PATCH] Fix compat with latest mingw64-headers)

[GNU bug Tracking System]

Your message dated Tue, 11 May 2021 18:46:50 +0300
with message-id <83wns546j9.fsf@gnu.org>
and subject line Re: bug#48354: [PATCH] Fix compat with latest mingw64-headers
has caused the debbugs.gnu.org bug report #48354,
regarding [PATCH] Fix compat with latest mingw64-headers
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
48354: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48354
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH] Fix compat with latest mingw64-headers Date: Tue, 11 May 2021 12:59:47 +0000

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

Best regards,
Konstantin Shabanov

0001-Reorder-headers-inclusion.patch
Description: Binary data

0003-Fix-compatibility-with-the-latest-mingw64-headers.patch
Description: Binary data

0002-Rename-OS_9X-to-OS_WIN95ORGREATER.patch
Description: Binary data

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#48354: [PATCH] Fix compat with latest mingw64-headers
>
>
>
>
> Date: 
>
> Tue, 11 May 2021 18:46:50 +0300
>
>
>
>
> > Date: Tue, 11 May 2021 12:59:47 +0000
> > From: Konstantin Shabanov <mail@etehtsea.me>
> > 
> > 
> > [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.
>
>
> --- End Message ---