mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

More fixes for bug #12878 with MS-Windows MSVC build.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2012-11-19 19:34:21 +02:00
parent bc715d67b3
commit 88c4a13c3b
6 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nt/ChangeLog
View File

@ -1,3 +1,7 @@
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>
* inc/unistd.h (setpgid, getpgrp): Provide prototypes. (Bug#12776)

1
nt/inc/stdint.h
View File

@ -60,6 +60,7 @@ typedef unsigned int uint32_t;
#endif
#define PTRDIFF_MAX INTPTR_MAX
#define PTRDIFF_MIN INTPTR_MIN
#endif /* !__GNUC__ */

12
src/ChangeLog
View File

@ -1,3 +1,15 @@
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>
* fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)

13
src/w32.c
View File

@ -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. */

2
src/w32term.h
View File

@ -758,7 +758,7 @@ extern int w32_system_caret_y;
typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR);
typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR);
BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD)
BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
#ifdef UNICODE
#define EnumSystemLocales EnumSystemLocalesW
#else

6
src/xdisp.c
View File

@ -29433,8 +29433,10 @@ start_hourglass (void)
delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
#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 */
hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,