# HG changeset patch # User Christian Brabandt # Date 1452438905 -3600 # Node ID fb84355cd972c3b4debc0af78a2730fa72f69534 # Parent 7619dd2089da39cdfb9cb021ca3cd05be15052c1 commit https://github.com/vim/vim/commit/f32c5cd6e0e6aa6d4aeacb6bf52e3d3ba21e5201 Author: Bram Moolenaar Date: Sun Jan 10 16:07:44 2016 +0100 patch 7.4.1080 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) diff --git a/src/gui_w32.c b/src/gui_w32.c --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -1769,9 +1769,11 @@ gui_mch_init(void) #endif #ifdef FEAT_EVAL -# ifndef HandleToLong -/* HandleToLong() only exists in compilers that can do 64 bit builds */ -# define HandleToLong(h) ((long)(h)) +# if !defined(_MSC_VER) || (_MSC_VER < 1400) +/* Define HandleToLong for old MS and non-MS compilers if not defined. */ +# ifndef HandleToLong +# define HandleToLong(h) ((long)(h)) +# endif # endif /* set the v:windowid variable */ set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd)); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1080, +/**/ 1079, /**/ 1078,