aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-26 23:22:39 +0200
committerEli Zaretskii2013-03-26 23:22:39 +0200
commitc6e72e1739cfff4f713fdbb8369ce89341ad9a6b (patch)
treed6316d64b977b482e61c69303b0bc4c0ac9de88e /src
parentee0fb40e7c9797964dcf3f27a396993d6db25f3e (diff)
downloademacs-c6e72e1739cfff4f713fdbb8369ce89341ad9a6b.tar.gz
emacs-c6e72e1739cfff4f713fdbb8369ce89341ad9a6b.zip
Fix MinGW64 compilation of w32.c.
src/w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7a0c223bbe8..94eef08b5f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-03-26 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
4
12013-03-26 Jan Djärv <jan.h.d@swipnet.se> 52013-03-26 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * gtkutil.c (style_changed_cb): Check if frame is live and an 7 * 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 {
130#define SDDL_REVISION_1 1 130#define SDDL_REVISION_1 1
131#endif /* SDDL_REVISION_1 */ 131#endif /* SDDL_REVISION_1 */
132 132
133#ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE 133#if defined(_MSC_VER) || defined(_W64)
134/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the 134/* MSVC and MinGW64 don't provide the definition of
135 associated macros, except on ntifs.h, which cannot be included 135 REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h,
136 because it triggers conflicts with other Windows API headers. So 136 which cannot be included because it triggers conflicts with other
137 we define it here by hand. */ 137 Windows API headers. So we define it here by hand. */
138 138
139typedef struct _REPARSE_DATA_BUFFER { 139typedef struct _REPARSE_DATA_BUFFER {
140 ULONG ReparseTag; 140 ULONG ReparseTag;