aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32.c
diff options
context:
space:
mode:
authorOscar Fuentes2014-11-17 23:06:13 +0100
committerOscar Fuentes2014-11-17 23:10:00 +0100
commit81e0cca7bbc99dbfda898a8aaab740ae121cf045 (patch)
tree7ee980226205173954792911af2d0d51686d5926 /src/w32.c
parent67a22c6062fdaff39c27611d21cd5866661f8e15 (diff)
downloademacs-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/w32.c')
-rw-r--r--src/w32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32.c b/src/w32.c
index aba0b5a81f9..34f28d01af3 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -72,8 +72,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
72#include <pwd.h> 72#include <pwd.h>
73#include <grp.h> 73#include <grp.h>
74 74
75/* MinGW64 (_W64) defines these in its _mingw.h. */ 75/* MinGW64 defines these in its _mingw.h. */
76#if defined(__GNUC__) && !defined(_W64) 76#if defined(__GNUC__) && !defined(MINGW_W64)
77#define _ANONYMOUS_UNION 77#define _ANONYMOUS_UNION
78#define _ANONYMOUS_STRUCT 78#define _ANONYMOUS_STRUCT
79#endif 79#endif
@@ -149,7 +149,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
149#define SDDL_REVISION_1 1 149#define SDDL_REVISION_1 1
150#endif /* SDDL_REVISION_1 */ 150#endif /* SDDL_REVISION_1 */
151 151
152#if defined(_MSC_VER) || defined(_W64) 152#if defined(_MSC_VER) || defined(MINGW_W64)
153/* MSVC and MinGW64 don't provide the definition of 153/* MSVC and MinGW64 don't provide the definition of
154 REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h, 154 REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h,
155 which cannot be included because it triggers conflicts with other 155 which cannot be included because it triggers conflicts with other