diff options
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.h b/src/w32term.h index 9a6c358982a..4c496e97e4a 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -478,7 +478,7 @@ struct scroll_bar { #ifdef _WIN64 /* Building a 64-bit C integer from two 32-bit lisp integers. */ -#define SCROLL_BAR_PACK(low, high) (XINT (high) << 32 | XINT (low)) +#define SCROLL_BAR_PACK(low, high) (XFIXNUM (high) << 32 | XFIXNUM (low)) /* Setting two lisp integers to the low and high words of a 64-bit C int. */ #define SCROLL_BAR_UNPACK(low, high, int64) \ @@ -486,7 +486,7 @@ struct scroll_bar { XSETINT ((high), ((DWORDLONG)(int64) >> 32) & 0xffffffff)) #else /* not _WIN64 */ /* 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))) +#define SCROLL_BAR_PACK(low, high) ((UINT_PTR)(XFIXNUM (high) << 16 | XFIXNUM (low))) /* Setting two lisp integers to the low and high words of a 32-bit C int. */ #define SCROLL_BAR_UNPACK(low, high, int32) \ @@ -817,6 +817,8 @@ extern struct window *w32_system_caret_window; extern int w32_system_caret_hdr_height; extern int w32_system_caret_mode_height; +extern Window tip_window; + #ifdef _MSC_VER #ifndef EnumSystemLocales /* MSVC headers define these only for _WIN32_WINNT >= 0x0500. */ |