[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112151: Fix compilation of addpm wit
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112151: Fix compilation of addpm with MinGW64. |
Date: |
Wed, 27 Mar 2013 09:21:43 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112151
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-27 09:21:43 +0200
message:
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.
modified:
nt/ChangeLog
nt/addpm.c
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-03-26 20:30:43 +0000
+++ b/nt/ChangeLog 2013-03-27 07:21:43 +0000
@@ -1,3 +1,8 @@
+2013-03-27 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.
=== modified file 'nt/addpm.c'
--- a/nt/addpm.c 2013-03-26 08:21:27 +0000
+++ b/nt/addpm.c 2013-03-27 07:21:43 +0000
@@ -34,6 +34,10 @@
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 @@
#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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112151: Fix compilation of addpm with MinGW64.,
Eli Zaretskii <=