diff options
author | Eli Zaretskii <eliz@gnu.org> | 2015-01-13 19:16:51 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2015-01-13 19:16:51 +0200 |
commit | 5aa618b05807d560126dfd09b9c9cb6b957b98de (patch) | |
tree | b739bec3884c4ed03158b8be0edd0c831540d0d7 /src/w32term.h | |
parent | 30c5f5cdef8db72c007efecfc8436479631b45d0 (diff) | |
download | emacs-5aa618b05807d560126dfd09b9c9cb6b957b98de.tar.gz |
Fix problems with 32-bit wide-int build exposed by MinGW
lisp.h (XPNTR): Move definition to after XTYPE, to avoid
compilation error in an unoptimized build when !USE_LSB_TAG.
src/w32heap.c (DUMPED_HEAP_SIZE): For 32-bit wide-int build, use the
same larger value as for the 64-bit build.
src/w32term.h (SCROLL_BAR_PACK): Cast the result to UINT_PTR to
avoid compiler warnings.
src/w32proc.c (Fw32_get_codepage_charset, Fw32_set_keyboard_layout):
Avoid compiler warnings about cast from integer to pointer of
different size.
src/w32menu.c (menubar_selection_callback, w32_menu_show): Cast to
UINT_PTR instead of EMACS_INT, to avoid compiler warnings about
casting from integer to pointer of different size.
(add_menu_item): Pass the help-echo string as a pointer to
Lisp_String, not as a Lisp_Object.
(w32_menu_display_help): Use make_lisp_ptr to reconstruct a Lisp
string object from its C pointer.
src/w32fns.c (w32_msg_pump) <WM_EMACS_UNREGISTER_HOT_KEY>: Use
make_lisp_ptr instead of XIL, to reconstruct a Lisp_Cons from its
C pointer.
<WM_EMACS_TOGGLE_LOCK_KEY>: msg.lparam is now a C integer.
(Fx_create_frame): Type-cast the result of XFASTINT to avoild
compiler warnings about size differences.
(Fw32_unregister_hot_key): Pass the tail of w32_grabbed_keys as a
pointer to a Lisp_Cons struct, not as a disguised EMACS_INT.
(Fw32_toggle_lock_key): Pass the new state of the key as a C
integer; use -1 for nil. Doc fix.
src/.gdbinit (xgetsym): New subroutine.
(xsymname, xsymbol): Use it.
(xprintsym): No need to call xgetptr.
Diffstat (limited to 'src/w32term.h')
-rw-r--r-- | src/w32term.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32term.h b/src/w32term.h index 042d7abd945..c905ef15737 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -493,8 +493,8 @@ struct scroll_bar { (XSETINT ((low), ((DWORDLONG)(int64)) & 0xffffffff), \ XSETINT ((high), ((DWORDLONG)(int64) >> 32) & 0xffffffff)) #else /* not _WIN64 */ -/* Building a 32-bit C integer from two 16-bit lisp integers. */ -#define SCROLL_BAR_PACK(low, high) (XINT (high) << 16 | XINT (low)) +/* Building a 32-bit C unsigned integer from two 16-bit lisp integers. */ +#define SCROLL_BAR_PACK(low, high) ((UINT_PTR)(XINT (high) << 16 | XINT (low))) /* Setting two lisp integers to the low and high words of a 32-bit C int. */ #define SCROLL_BAR_UNPACK(low, high, int32) \ |