Mercurial > vim
changeset 2224:a0cce15dd2a9 vim73
Fix definition of UINT_PTR for 64 bit systems.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 26 May 2010 21:42:54 +0200 |
parents | 81b83a19e127 |
children | dd5c1983e355 |
files | runtime/doc/todo.txt src/GvimExt/gvimext.h src/gui_w32.c src/if_ole.cpp |
diffstat | 4 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -36,6 +36,10 @@ to not run autocommands when leaving Vim Invalid memory access when deleting funcref variable. Patch by Lech Lorens, 2010 May 25. +Fixes for broken URLs: + Benjamin Haskell, 2010 May 25 + Christian Brabandt, 2010 May 26, two messages + Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6) E315 when trying to change a file in FileChangedRO autocommand event.
--- a/src/GvimExt/gvimext.h +++ b/src/GvimExt/gvimext.h @@ -44,7 +44,7 @@ #include <shlobj.h> /* Accommodate old versions of VC that don't have a modern Platform SDK */ -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR) # undef UINT_PTR # define UINT_PTR UINT #endif
--- 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 }}}"); }
--- a/src/if_ole.cpp +++ b/src/if_ole.cpp @@ -34,9 +34,10 @@ extern HWND s_hwnd; extern HWND vim_parent_hwnd; } -#if _MSC_VER < 1300 +#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