unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Andy Moreton <andrewjmoreton@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: master 237f4f9295: Fix dimensions of console window of restarted Emacs on MS-Windows
Date: Thu, 21 Apr 2022 09:12:29 +0300	[thread overview]
Message-ID: <831qxrrmlu.fsf@gnu.org> (raw)
In-Reply-To: <8635i7scs0.fsf@gmail.com> (message from Andy Moreton on Wed, 20 Apr 2022 21:47:11 +0100)

> 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,



  reply	other threads:[~2022-04-21  6:12 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2022-04-21  8:46   ` Andy Moreton
2022-04-21 10:54     ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=831qxrrmlu.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=andrewjmoreton@gmail.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).