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 7a0c223bbe81a65b7d612bf70ed80b1571973761..94eef08b5f8d4117697d4a52c40a66ccd6d5a722 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
+
 2013-03-26  Jan Djärv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (style_changed_cb): Check if frame is live and an

diff --git a/src/w32.c b/src/w32.c
index f3c98bf95966acbec17500beae0f6c38ad00b1db..93a4ce1a8c1286eb4f63b8b1ecc5a972fe0db010 100644 (file)
--- 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;