diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 13:02:04 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 13:02:04 -0400 |
| commit | 7191318b716debaca15b56ebf7b13f5a1b07b0f9 (patch) | |
| tree | 010209f880a0076436ef0140ef11883dddd88ad9 /src | |
| parent | febf4467bde3a7d90265f826f7e450a5c0f6ca46 (diff) | |
| parent | 864a4dc236395e441aafd23b9cbca099afdc5324 (diff) | |
| download | emacs-7191318b716debaca15b56ebf7b13f5a1b07b0f9.tar.gz | |
Merge from origin/emacs-29
864a4dc2363 Fix compilation of w32.c with old MinGW system headers
a22eb9ae0f9 ruby-add-log-current-method: Reduce the use of 'nreverse'
17d803d0a75 Fix detection of WebP images by their signature
43290391ce2 ; Eglot: make version parseable by version-to-list
6e6e8b5c974 Add more documentation for the keys of `package-vc-select...
7972b76c2c7 ; vc-checkout: Wrap var lookup in 'bound-and-true-p'
e9fef1d70ff vc-checkout: Try to use the vc-dir's backend first
372e024accd ; Fix wallpaper-tests on XFCE
7055fd8e43e Improve documentation related to 'ispell-complete-word'
61fd017abde * configure.ac: Add -lbsd on Haiku.
05971c4d9a4 Add menu to 'c-ts-mode' and 'c++-ts-mode'
# Conflicts:
# lisp/progmodes/eglot.el
# lisp/progmodes/ruby-mode.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/w32.c b/src/w32.c index 8d344d2e6da..a6bc0f4b2ee 100644 --- a/src/w32.c +++ b/src/w32.c @@ -543,7 +543,14 @@ typedef LANGID (WINAPI *GetUserDefaultUILanguage_Proc) (void); typedef COORD (WINAPI *GetConsoleFontSize_Proc) (HANDLE, DWORD); -#if _WIN32_WINNT < 0x0501 +/* Old versions of mingw.org's MinGW, before v5.2.0, don't have a + _WIN32_WINNT guard for CONSOLE_FONT_INFO in wincon.h, and so don't + need the conditional definition below, which causes compilation + errors. Note: MinGW64 sets _WIN32_WINNT to a higher version, and + its w32api.h version stays fixed at 3.14. */ +#if _WIN32_WINNT < 0x0501 \ + && (__W32API_MAJOR_VERSION > 5 \ + || (__W32API_MAJOR_VERSION == 5 && __W32API_MINOR_VERSION >= 2)) typedef struct { DWORD nFont; |