Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org

1 files changed, 8 insertions, 0 deletions

diff --git a/src/w32.c b/src/w32.c
index c8e16dfaa94..e81fc7b4f3e 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -150,10 +150,18 @@ typedef struct _REPARSE_DATA_BUFFER {
     } DUMMYUNIONNAME;
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 
+#ifndef FILE_DEVICE_FILE_SYSTEM
 #define FILE_DEVICE_FILE_SYSTEM 9
+#endif
+#ifndef METHOD_BUFFERED
 #define METHOD_BUFFERED         0
+#endif
+#ifndef FILE_ANY_ACCESS
 #define FILE_ANY_ACCESS         0x00000000
+#endif
+#ifndef CTL_CODE
 #define CTL_CODE(t,f,m,a)       (((t)<<16)|((a)<<14)|((f)<<2)|(m))
+#endif
 #define FSCTL_GET_REPARSE_POINT \
   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif