aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1080

Browse Source 
Problem:    VS2015 has a function HandleToLong() that is shadowed by the macro
            that Vim defines.
Solution:   Do not define HandleToLong() for MSVC version 1400 and later.
            (Mike Williams)
This commit is contained in:
Bram Moolenaar
2016-01-10 16:07:44 +01:00
parent b86a343280
commit f32c5cd6e0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_w32.c
View File

@@ -1769,9 +1769,11 @@ gui_mch_init(void)
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
# if !defined(_MSC_VER) || (_MSC_VER < 1400)
/* Define HandleToLong for old MS and non-MS compilers if not defined. */
# ifndef HandleToLong # ifndef HandleToLong
/* HandleToLong() only exists in compilers that can do 64 bit builds */
# define HandleToLong(h) ((long)(h)) # define HandleToLong(h) ((long)(h))
# endif
# endif # endif
/* set the v:windowid variable */ /* set the v:windowid variable */
set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd)); set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd));

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1080,
/**/ /**/
1079, 1079,
/**/ /**/