Commit 88c4a13c authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent bc715d67
2012-11-19 Eli Zaretskii <eliz@gnu.org>
* inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
2012-11-01 Eli Zaretskii <eliz@gnu.org> 2012-11-01 Eli Zaretskii <eliz@gnu.org>
* inc/unistd.h (setpgid, getpgrp): Provide prototypes. (Bug#12776) * inc/unistd.h (setpgid, getpgrp): Provide prototypes. (Bug#12776)
......
...@@ -60,6 +60,7 @@ typedef unsigned int uint32_t; ...@@ -60,6 +60,7 @@ typedef unsigned int uint32_t;
#endif #endif
#define PTRDIFF_MAX INTPTR_MAX #define PTRDIFF_MAX INTPTR_MAX
#define PTRDIFF_MIN INTPTR_MIN
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */
......
2012-11-19 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of
w32_note_current_window with code. (Backport from trunk.)
* w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
(FILE_ANY_ACCESS, CTL_CODE, FSCTL_GET_REPARSE_POINT) [_MSC_VER]:
Define for the MSVC compiler.
* w32term.h (EnumSystemLocalesW) [_MSC_VER]: Add a missing
semi-colon.
2012-11-18 Eli Zaretskii <eliz@gnu.org> 2012-11-18 Eli Zaretskii <eliz@gnu.org>
   
* fileio.c (Fsubstitute_in_file_name, Ffile_name_directory) * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
......
...@@ -119,9 +119,10 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { ...@@ -119,9 +119,10 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
#include <aclapi.h> #include <aclapi.h>
#ifdef _MSC_VER #ifdef _MSC_VER
/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER, except /* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the
on ntifs.h, which cannot be included because it triggers conflicts associated macros, except on ntifs.h, which cannot be included
with other Windows API headers. So we define it here by hand. */ because it triggers conflicts with other Windows API headers. So
we define it here by hand. */
typedef struct _REPARSE_DATA_BUFFER { typedef struct _REPARSE_DATA_BUFFER {
ULONG ReparseTag; ULONG ReparseTag;
...@@ -149,6 +150,12 @@ typedef struct _REPARSE_DATA_BUFFER { ...@@ -149,6 +150,12 @@ typedef struct _REPARSE_DATA_BUFFER {
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; } 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 #endif
/* TCP connection support. */ /* TCP connection support. */
......
...@@ -758,7 +758,7 @@ extern int w32_system_caret_y; ...@@ -758,7 +758,7 @@ extern int w32_system_caret_y;
typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR);
typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR);
BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD) BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
#ifdef UNICODE #ifdef UNICODE
#define EnumSystemLocales EnumSystemLocalesW #define EnumSystemLocales EnumSystemLocalesW
#else #else
......
...@@ -29433,8 +29433,10 @@ start_hourglass (void) ...@@ -29433,8 +29433,10 @@ start_hourglass (void)
delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0); delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
   
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
extern void w32_note_current_window (void); {
w32_note_current_window (); extern void w32_note_current_window (void);
w32_note_current_window ();
}
#endif /* HAVE_NTGUI */ #endif /* HAVE_NTGUI */
   
hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay, hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment