diff options
| author | Fabrice Popineau <fabrice.popineau@supelec.fr> | 2013-12-31 18:01:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-31 18:01:34 +0200 |
| commit | bd717ca4f4c25e45dcb3b894323fd608ae278922 (patch) | |
| tree | b61f9c9c54d45cd408bf2c8e1198db3e84172bec /nt | |
| parent | 535f0fbd00ab0cdb65c09270ea8df03f9528f127 (diff) | |
| download | emacs-bd717ca4f4c25e45dcb3b894323fd608ae278922.tar.gz | |
Minor fixes for MinGW64 build.
configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit
MinGW64 build on MS-Windows.
nt/inc/ms-w32.h (sys_kill): Fix prototype.
src/w32term.c (w32_initialize): Use LCID and LOWORD.
src/w32proc.c (create_child): Use pid_t for 5th argument.
(IsValidLocale): Don't provide prototype for MinGW64.
(Fw32_get_valid_keyboard_layouts, Fw32_get_keyboard_layout)
(Fw32_set_keyboard_layout): Use HKL and HIWORD/LOWORD.
src/w32heap.c (allocate_heap) [_WIN64]: Use "ull", not "i64", which
MinGW64 doesn't support.
src/lisp.h (EMACS_INT) [_WIN64]: Define for the MinGW64 build.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 8eb601d4e3e..8083fc59473 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-12-31 Fabrice Popineau <fabrice.popineau@supelec.fr> + + * inc/ms-w32.h (sys_kill): Fix prototype. + 2013-12-30 Eli Zaretskii <eliz@gnu.org> * inc/ms-w32.h (umask) [emacs]: Redirect to sys_umask. (Bug#16299) diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 735f9a65320..aa7690ca0fa 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -394,7 +394,7 @@ extern int setpgrp (int, int); extern int sigaction (int, const struct sigaction *, struct sigaction *); extern int alarm (int); -extern int sys_kill (int, int); +extern int sys_kill (pid_t, int); /* For integration with MSDOS support. */ |