Fix compilation of addpm with MinGW64.

 nt/addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
 headers, since that's where _W64 is declared by MinGW64.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f851004f605ead0b3cd5d103dd6ba5221b604ebc..1ae819424afafc3ab0c3a8d6466cf759f911a3ce 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
+       headers, since that's where _W64 is declared by MinGW64.
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.

diff --git a/nt/addpm.c b/nt/addpm.c
index 8079d51dd64b024d48143f739b77e39d47e8331e..688e0167334e15ac21504a9143ed35e5690380dd 100644 (file)
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -34,6 +34,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    installed, then the DDE fallback for creating icons the Windows 3.1
    progman way will be used instead, but that is prone to lockups
    caused by other applications not servicing their message queues.  */
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+
 /* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
    below 0x500.  */
 #ifndef _W64
@@ -45,9 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <windows.h>
 #include <shlobj.h>
 #include <ddeml.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <malloc.h>
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,