[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 237f4f9295: Fix dimensions of console window of restarted Ema
From: |
Eli Zaretskii |
Subject: |
Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows |
Date: |
Thu, 21 Apr 2022 09:12:29 +0300 |
> 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,