From: Eli Zaretskii Date: Tue, 26 Mar 2013 21:22:39 +0000 (+0200) Subject: Fix MinGW64 compilation of w32.c. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~80 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6e72e1739cfff4f713fdbb8369ce89341ad9a6b;p=emacs.git Fix MinGW64 compilation of w32.c. src/w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64. --- diff --git a/src/ChangeLog b/src/ChangeLog index 7a0c223bbe8..94eef08b5f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Eli Zaretskii + + * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64. + 2013-03-26 Jan Djärv * gtkutil.c (style_changed_cb): Check if frame is live and an diff --git a/src/w32.c b/src/w32.c index f3c98bf9596..93a4ce1a8c1 100644 --- a/src/w32.c +++ b/src/w32.c @@ -130,11 +130,11 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { #define SDDL_REVISION_1 1 #endif /* SDDL_REVISION_1 */ -#ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE -/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the - associated macros, except on ntifs.h, which cannot be included - because it triggers conflicts with other Windows API headers. So - we define it here by hand. */ +#if defined(_MSC_VER) || defined(_W64) +/* MSVC and MinGW64 don't provide the definition of + REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h, + which cannot be included because it triggers conflicts with other + Windows API headers. So we define it here by hand. */ typedef struct _REPARSE_DATA_BUFFER { ULONG ReparseTag;