diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-11-19 19:34:21 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-19 19:34:21 +0200 |
| commit | 88c4a13c3b573e0fa844c88ab89765ef308c267e (patch) | |
| tree | 51ebae41ad5eeeccf1fb49dd2e1d556068cfb87a /src/w32.c | |
| parent | bc715d67b3997988e2a48286410d45404e49342c (diff) | |
| download | emacs-88c4a13c3b573e0fa844c88ab89765ef308c267e.tar.gz | |
More fixes for bug #12878 with MS-Windows MSVC build.
src/xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of
w32_note_current_window with code. (Backport from trunk.)
src/w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
(FILE_ANY_ACCESS, CTL_CODE, FSCTL_GET_REPARSE_POINT) [_MSC_VER]:
Define for the MSVC compiler.
src/w32term.h (EnumSystemLocalesW) [_MSC_VER]: Add a missing
semi-colon.
nt/inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/w32.c b/src/w32.c index 5ac1bc3eb7c..1c3331516d4 100644 --- a/src/w32.c +++ b/src/w32.c @@ -119,9 +119,10 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { #include <aclapi.h> #ifdef _MSC_VER -/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER, except - on ntifs.h, which cannot be included because it triggers conflicts - with other Windows API headers. So we define it here by hand. */ +/* 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. */ typedef struct _REPARSE_DATA_BUFFER { ULONG ReparseTag; @@ -149,6 +150,12 @@ typedef struct _REPARSE_DATA_BUFFER { } DUMMYUNIONNAME; } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; +#define FILE_DEVICE_FILE_SYSTEM 9 +#define METHOD_BUFFERED 0 +#define FILE_ANY_ACCESS 0x00000000 +#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) +#define FSCTL_GET_REPARSE_POINT \ + CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif /* TCP connection support. */ |