diff --git a/src/gui_w32.c b/src/gui_w32.c
index c5bd81d..db0a9d5 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1769,9 +1769,11 @@
 #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 723dcf8..449dd55 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1080,
+/**/
     1079,
 /**/
     1078,