* master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows
@ 2022-04-20 20:47 Andy Moreton
2022-04-21 6:12 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Andy Moreton @ 2022-04-20 20:47 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows
2022-04-20 20:47 master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows Andy Moreton
@ 2022-04-21 6:12 ` Eli Zaretskii
2022-04-21 8:46 ` Andy Moreton
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2022-04-21 6:12 UTC (permalink / raw)
To: Andy Moreton; +Cc: emacs-devel
> 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,
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows
2022-04-21 6:12 ` Eli Zaretskii
@ 2022-04-21 8:46 ` Andy Moreton
2022-04-21 10:54 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Andy Moreton @ 2022-04-21 8:46 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows
2022-04-21 8:46 ` Andy Moreton
@ 2022-04-21 10:54 ` Eli Zaretskii
0 siblings, 0 replies; 4+ messages in thread
From: Eli Zaretskii @ 2022-04-21 10:54 UTC (permalink / raw)
To: Andy Moreton; +Cc: emacs-devel
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-21 10:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20 20:47 master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows Andy Moreton
2022-04-21 6:12 ` Eli Zaretskii
2022-04-21 8:46 ` Andy Moreton
2022-04-21 10:54 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).