master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows

master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows

[Andy Moreton]

Hi,

Building master on Windows with mingw64 fails after this commit, as the
mingw64 headers already define CONSOLE_FONT_INFO (in wincon.h).

Commenting out the definition in w32.c works around it and allows the
build to complete.

    AndyM

Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Wed, 20 Apr 2022 21:47:11 +0100
> 
> Hi,
> 
> Building master on Windows with mingw64 fails after this commit, as the
> mingw64 headers already define CONSOLE_FONT_INFO (in wincon.h).

Sorry about that.  Does the below solve the problem?

diff --git a/src/w32.c b/src/w32.c
index a8f6956..25f5555 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -539,11 +539,15 @@ int (WINAPI *pWideCharToMultiByte)(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOO
 typedef LANGID (WINAPI *GetUserDefaultUILanguage_Proc) (void);
 
 typedef COORD (WINAPI *GetConsoleFontSize_Proc) (HANDLE, DWORD);
+
+#if _WIN32_WINNT < 0x0501
 typedef struct
 {
   DWORD nFont;
   COORD dwFontSize;
 } CONSOLE_FONT_INFO;
+#endif
+
 typedef BOOL (WINAPI *GetCurrentConsoleFont_Proc) (
     HANDLE,
     BOOL,

Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows

[Andy Moreton]

On Thu 21 Apr 2022, Eli Zaretskii wrote:

>> From: Andy Moreton <andrewjmoreton@gmail.com>
>> Date: Wed, 20 Apr 2022 21:47:11 +0100
>> 
>> Hi,
>> 
>> Building master on Windows with mingw64 fails after this commit, as the
>> mingw64 headers already define CONSOLE_FONT_INFO (in wincon.h).
>
> Sorry about that.  Does the below solve the problem?
>

No problem. Your patch is good, and the build completes normally.

Thanks,

    AndyM

Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Thu, 21 Apr 2022 09:46:50 +0100
> 
> On Thu 21 Apr 2022, Eli Zaretskii wrote:
> 
> >> From: Andy Moreton <andrewjmoreton@gmail.com>
> >> Date: Wed, 20 Apr 2022 21:47:11 +0100
> >> 
> >> Hi,
> >> 
> >> Building master on Windows with mingw64 fails after this commit, as the
> >> mingw64 headers already define CONSOLE_FONT_INFO (in wincon.h).
> >
> > Sorry about that.  Does the below solve the problem?
> >
> 
> No problem. Your patch is good, and the build completes normally.

Thanks, installed.