From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Aug 2018 13:10:28 +0000 (+0300)
Subject: Avoid compilation warning in nt/addpm.c
X-Git-Tag: emacs-26.1.90~198
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=22d1f534a19b2382c8621f9778aac8a94b43ef0d;p=emacs.git

Avoid compilation warning in nt/addpm.c

* nt/addpm.c [!MINGW_W64]: Undefine _WIN32_IE before
redefining it, to avoid compilation warnings.
---

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