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
index c5bd81d85ceafabd173f6ef0ea637b7ee2876316..db0a9d5bfaa618de3b2f47d7626ae6f69e51c15f 100644 (file)
--- 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
index 723dcf8a6ba3a23b940693e3063386b09d6c3287..449dd55b82829abe4bb881c2213240f7fe7464bb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1080,
 /**/
     1079,
 /**/