From: Eli Zaretskii <eliz@gnu.org>
To: gdb-patches@sourceware.org
Subject: Fix compilation using mingw.org's MinGW
Date: Thu, 18 Apr 2019 15:36:00 -0000 [thread overview]
Message-ID: <835zrbe36c.fsf@gnu.org> (raw)
windows-nat.c uses CONSOLE_FONT_INFO unconditionally, but the
corresponding declaration in the Windows API headers is conditional,
because the APIs using CONSOLE_FONT_INFO are only available since
Windows XP. When that condition doesn't hold, windows-nat.c won't
compile:
windows-nat.c:114:10: error: 'CONSOLE_FONT_INFO' has not been declared
CONSOLE_FONT_INFO *);
^~~~~~~~~~~~~~~~~
windows-nat.c: In function 'void windows_set_console_info(STARTUPINFOA*, DWORD*)':
windows-nat.c:2174:7: error: 'CONSOLE_FONT_INFO' was not declared in this scope
CONSOLE_FONT_INFO cfi;
^~~~~~~~~~~~~~~~~
windows-nat.c:2174:7: note: suggested alternative: 'CONSOLE_CURSOR_INFO'
CONSOLE_FONT_INFO cfi;
^~~~~~~~~~~~~~~~~
CONSOLE_CURSOR_INFO
windows-nat.c:2176:48: error: 'cfi' was not declared in this scope
GetCurrentConsoleFont (hconsole, FALSE, &cfi);
^~~
windows-nat.c: At global scope:
windows-nat.c:3302:55: error: 'CONSOLE_FONT_INFO' has not been declared
bad_GetCurrentConsoleFont (HANDLE w, BOOL bMaxWindow, CONSOLE_FONT_INFO *f)
^~~~~~~~~~~~~~~~~
windows-nat.c: In function 'BOOL bad_GetCurrentConsoleFont(HANDLE, BOOL, int*)':
windows-nat.c:3304:6: error: request for member 'nFont' in '* f', which is of non-class type 'int'
f->nFont = 0;
^~~~~
MinGW64 no longer supports versions of Windows older than XP, but
mingw.org's MinGW does. Since we load GetCurrentConsoleFont
dynamically at run time, and have code for when the load fails, it
makes sense to not assume XP at compile time. The patch below does
that. OK to push (with the pertinent ChangeLog entry)?
--- gdb/windows-nat.c~0 2019-03-27 00:52:05.000000000 +0200
+++ gdb/windows-nat.c 2019-04-18 11:37:02.061945600 +0300
@@ -81,6 +81,16 @@
#define GetConsoleFontSize dyn_GetConsoleFontSize
#define GetCurrentConsoleFont dyn_GetCurrentConsoleFont
+#if _WIN32_WINNT < 0x0501
+
+typedef
+struct _CONSOLE_FONT_INFO
+{ DWORD nFont;
+ COORD dwFontSize;
+} CONSOLE_FONT_INFO, *PCONSOLE_FONT_INFO;
+
+#endif
+
typedef BOOL WINAPI (AdjustTokenPrivileges_ftype) (HANDLE, BOOL,
PTOKEN_PRIVILEGES,
DWORD, PTOKEN_PRIVILEGES,
next reply other threads:[~2019-04-18 15:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 15:36 Eli Zaretskii [this message]
2019-04-18 17:01 ` Kevin Buettner
2019-04-18 18:54 ` Eli Zaretskii
2019-04-18 20:38 ` Kevin Buettner
2019-04-19 6:19 ` Eli Zaretskii
2019-04-18 17:20 ` Pedro Alves
2019-04-18 17:22 ` Pedro Alves
2019-04-18 18:57 ` Eli Zaretskii
2019-04-19 10:51 ` Pedro Alves
2019-04-19 11:23 ` Eli Zaretskii
2019-04-19 11:33 ` Pedro Alves
2019-04-28 14:33 ` Eli Zaretskii
2019-04-30 12:56 ` Pedro Alves
2019-04-30 13:06 ` LRN
2019-04-30 15:25 ` Eli Zaretskii
2019-04-30 17:04 ` Pedro Alves
2019-04-30 17:17 ` Eli Zaretskii
2019-04-30 17:26 ` Pedro Alves
2019-04-30 17:40 ` Eli Zaretskii
2019-04-30 17:58 ` Pedro Alves
[not found] ` <83o94nqr4g.fsf@gnu.org>
2019-04-30 18:38 ` Pedro Alves
2019-04-30 17:50 ` LRN
2019-04-30 13:10 ` Pedro Alves
2019-04-30 15:23 ` Eli Zaretskii
2019-04-30 16:31 ` Pedro Alves
2019-05-03 8:04 ` Eli Zaretskii
2019-05-03 8:26 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=835zrbe36c.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=gdb-patches@sourceware.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox