diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-26 21:42:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-26 21:42:54 +0200 |
| commit | 167632fcddd32656a737fa5568504fff12d04f70 (patch) | |
| tree | 9f240502e198c104aefd848f52cf108d9089e3a4 /src/gui_w32.c | |
| parent | 6a18eb6f621129ded4983fac667450051e63de14 (diff) | |
| download | vim-git-167632fcddd32656a737fa5568504fff12d04f70.tar.gz | |
Fix definition of UINT_PTR for 64 bit systems.
Diffstat (limited to 'src/gui_w32.c')
| -rw-r--r-- | src/gui_w32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 973981577..8a663d98b 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -183,9 +183,10 @@ # define ID_BEVAL_TOOLTIP 200 # define BEVAL_TEXT_LEN MAXPATHL -#if _MSC_VER < 1300 || !defined(UINT_PTR) +#if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR) /* Work around old versions of basetsd.h which wrongly declares * UINT_PTR as unsigned long. */ +# undef UINT_PTR # define UINT_PTR UINT #endif @@ -4697,7 +4698,7 @@ gui_mch_enable_beval_area(beval) if (beval == NULL) return; // TRACE0("gui_mch_enable_beval_area {{{"); - BevalTimerId = SetTimer(s_textArea, 0, p_bdlay / 2, BevalTimerProc); + BevalTimerId = SetTimer(s_textArea, 0, (UINT)(p_bdlay / 2), BevalTimerProc); // TRACE0("gui_mch_enable_beval_area }}}"); } |