procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation of addpm with MinGW64.

Browse source 
nt/addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
 headers, since that's where _W64 is declared by MinGW64.
This commit is contained in:
Eli Zaretskii 2013-03-27 09:21:43 +02:00
parent afeee3e578
commit c8e9d2b4ed
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nt/ChangeLog
View file

@ -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.

7
nt/addpm.c
View file

@ -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,