changeset 7560:fb84355cd972 v7.4.1080

commit https://github.com/vim/vim/commit/f32c5cd6e0e6aa6d4aeacb6bf52e3d3ba21e5201 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Sun, 10 Jan 2016 16:15:05 +0100
parents 7619dd2089da
children eab993bb6a61
files src/gui_w32.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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));
--- 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,