X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b1cb82edff21abfefd68af18370dddfd8cc1fec0..6ffb560b2a940d19419ac5afe11418588ef8c61f:/nt/addpm.c
diff --git a/nt/addpm.c b/nt/addpm.c
index 48c77821c8..cd91a3e2d8 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,5 @@
/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -38,9 +38,8 @@ along with GNU Emacs. If not, see . */
#include
#include
-/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
- below 0x500. */
-#ifndef _W64
+/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500. */
+#ifndef MINGW_W64
#define _WIN32_IE 0x400
#endif
/* Request C Object macros for COM interfaces. */
@@ -82,7 +81,7 @@ env_vars[] =
{
#ifdef OLD_PATHS
{"emacs_dir", NULL},
- {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
+ {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"},
{"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
{"EMACSDATA", "%emacs_dir%/etc"},
{"EMACSPATH", "%emacs_dir%/bin"},