This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Fix compilation using mingw.org's MinGW
- From: Eli Zaretskii <eliz at gnu dot org>
- To: gdb-patches at sourceware dot org
- Date: Thu, 18 Apr 2019 18:36:11 +0300
- Subject: Fix compilation using mingw.org's MinGW
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,