diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-26 15:10:50 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-26 15:10:50 -0700 |
| commit | 1afd313334c93cb5b0a7a378bd635a54dc1d6a9e (patch) | |
| tree | cb95ad44d35f9b32a8acc8bb00b7291f38549c52 /nt | |
| parent | 18d52b90a1692a47cea5b5e905a58a3b2c6c9a64 (diff) | |
| parent | 54fb383af6f6af7b72c28f38b308d9b24d2af4f6 (diff) | |
| download | emacs-1afd313334c93cb5b0a7a378bd635a54dc1d6a9e.tar.gz | |
Merge from origin/emacs-26
54fb383 (origin/emacs-26) Fix detection of freed emacs_values (Bug#32...
769d0cd ; Fix out-of-tree build for mod-test.so
9a1329e Avoid crashes with very wide TTY frames on MS-Windows
9a613d3 Prevent `modify-file-local-variable-prop-line' from adding ex...
624e7dc Update GNOME bugtracker URLs
51ef6d5 Clarify in the Emacs manual that ChangeLog files are not used
6e08019 Recognize codepage 65001 as a valid encoding
1a350d7 ; * etc/NEWS: Fix format of first lines of some entries.
22d1f53 Avoid compilation warning in nt/addpm.c
7bc9ce7 Fix duplicate custom group names in bibtex.el
a9cf938 Fix outdated text in the Calc manual
Conflicts:
etc/NEWS
etc/PROBLEMS
src/emacs-module.c
src/gtkutil.c
src/image.c
src/xterm.c
test/Makefile.in
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/addpm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nt/addpm.c b/nt/addpm.c index ec7d7ff52db..21320206d6e 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -38,9 +38,12 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include <stdio.h> #include <malloc.h> -/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500. */ +/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x0500. */ #ifndef MINGW_W64 -#define _WIN32_IE 0x400 +# ifdef _WIN32_IE +# undef _WIN32_IE +# endif +#define _WIN32_IE 0x0400 #endif /* Request C Object macros for COM interfaces. */ #define COBJMACROS 1 |