diff options
| author | Oscar Fuentes | 2014-11-17 23:06:13 +0100 |
|---|---|---|
| committer | Oscar Fuentes | 2014-11-17 23:10:00 +0100 |
| commit | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (patch) | |
| tree | 7ee980226205173954792911af2d0d51686d5926 /src/w32term.c | |
| parent | 67a22c6062fdaff39c27611d21cd5866661f8e15 (diff) | |
| download | emacs-81e0cca7bbc99dbfda898a8aaab740ae121cf045.tar.gz emacs-81e0cca7bbc99dbfda898a8aaab740ae121cf045.zip | |
Define MINGW_W64 and use it instead of _W64
... for detecting MinGW-w64. _W64 is not specific of MinGW-w64, it is
defined for compatibility with MS VC++.
* nt/inc/ms-w32.h: Define MINGW_W64.
* admin/CPP-DEFINES: Mention MINGW_W64.
* nt/addpm.c: Use it.
* nt/addsection.c: Use it.
* nt/preprep.c: Use it.
* src/w32.c: Use MINGW_W64 instead of _W64
* src/w32term.c: Likewise.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index 66cdbfaecb0..41ab645f31d 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -100,10 +100,10 @@ extern Cursor w32_load_cursor (LPCTSTR name); | |||
| 100 | struct w32_display_info one_w32_display_info; | 100 | struct w32_display_info one_w32_display_info; |
| 101 | struct w32_display_info *x_display_list; | 101 | struct w32_display_info *x_display_list; |
| 102 | 102 | ||
| 103 | #if _WIN32_WINNT < 0x0500 && !defined(_W64) | 103 | #if _WIN32_WINNT < 0x0500 && !defined(MINGW_W64) |
| 104 | /* Pre Windows 2000, this was not available, but define it here so | 104 | /* Pre Windows 2000, this was not available, but define it here so |
| 105 | that Emacs compiled on such a platform will run on newer versions. | 105 | that Emacs compiled on such a platform will run on newer versions. |
| 106 | MinGW64 (_W64) defines these unconditionally, so avoid redefining. */ | 106 | MinGW64 defines these unconditionally, so avoid redefining. */ |
| 107 | 107 | ||
| 108 | typedef struct tagWCRANGE | 108 | typedef struct tagWCRANGE |
| 109 | { | 109 | { |