[Emacs-diffs] /srv/bzr/emacs/trunk r112147: Fix MinGW64 compilation of w32.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112147
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 23:22:39 +0200
message:
  Fix MinGW64 compilation of w32.c.
  
   src/w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-26 15:34:45 +0000
+++ b/src/ChangeLog     2013-03-26 21:22:39 +0000
@@ -1,3 +1,7 @@
+2013-03-26  Eli Zaretskii  <address@hidden>
+
+       * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
+
 2013-03-26  Jan Djärv  <address@hidden>
 
        * gtkutil.c (style_changed_cb): Check if frame is live and an

=== modified file 'src/w32.c'
--- a/src/w32.c 2013-03-26 14:04:07 +0000
+++ b/src/w32.c 2013-03-26 21:22:39 +0000
@@ -130,11 +130,11 @@
 #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;