aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

Fix definition of UINT_PTR for 64 bit systems.

Browse Source
This commit is contained in:
Bram Moolenaar 2010-05-26 21:42:54 +02:00
parent 6a18eb6f62
commit 167632fcdd
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/todo.txt
View File

@ -36,6 +36,10 @@ to not run autocommands when leaving Vim? (James Vega, 2010 May 23)
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.

2
src/GvimExt/gvimext.h
View File

@ -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

5
src/gui_w32.c
View File

@ -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 }}}");
}

3
src/if_ole.cpp
View File

@ -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