diff options
| author | Fabrice Popineau | 2013-12-31 18:01:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-31 18:01:34 +0200 |
| commit | bd717ca4f4c25e45dcb3b894323fd608ae278922 (patch) | |
| tree | b61f9c9c54d45cd408bf2c8e1198db3e84172bec /src/lisp.h | |
| parent | 535f0fbd00ab0cdb65c09270ea8df03f9528f127 (diff) | |
| download | emacs-bd717ca4f4c25e45dcb3b894323fd608ae278922.tar.gz emacs-bd717ca4f4c25e45dcb3b894323fd608ae278922.zip | |
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 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index bb1c38e1bf6..0ae0e607253 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -62,7 +62,7 @@ INLINE_HEADER_BEGIN | |||
| 62 | pI - printf length modifier for EMACS_INT | 62 | pI - printf length modifier for EMACS_INT |
| 63 | EMACS_UINT - unsigned variant of EMACS_INT */ | 63 | EMACS_UINT - unsigned variant of EMACS_INT */ |
| 64 | #ifndef EMACS_INT_MAX | 64 | #ifndef EMACS_INT_MAX |
| 65 | # if LONG_MAX < LLONG_MAX && defined WIDE_EMACS_INT | 65 | # if LONG_MAX < LLONG_MAX && (defined(WIDE_EMACS_INT) || defined(_WIN64)) |
| 66 | typedef long long int EMACS_INT; | 66 | typedef long long int EMACS_INT; |
| 67 | typedef unsigned long long int EMACS_UINT; | 67 | typedef unsigned long long int EMACS_UINT; |
| 68 | # define EMACS_INT_MAX LLONG_MAX | 68 | # define EMACS_INT_MAX LLONG_MAX |