changeset 8102:441298d72f3c v7.4.1345

commit https://github.com/vim/vim/commit/a87e2c277eabf0134925c340e9dc4fe9446f3636 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 17 20:48:19 2016 +0100 patch 7.4.1345 Problem: A few more compiler warnings. (Axel Bender) Solution: Add type casts.
author Christian Brabandt <cb@256bit.org>
date Wed, 17 Feb 2016 21:00:06 +0100
parents ace65a22f6cf
children 7f88d25da8ac
files src/gui_w32.c src/gui_w48.c src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1772,7 +1772,7 @@ gui_mch_init(void)
 # 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))
+#   define HandleToLong(h) ((long)(intptr_t)(h))
 #  endif
 # endif
     /* set the v:windowid variable */
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2442,7 +2442,7 @@ add_tabline_popup_menu_entry(HMENU pmenu
 	info.fMask = MIIM_TYPE | MIIM_ID;
 	info.wID = item_id;
 	info.fType = MFT_STRING;
-	info.dwTypeData = item_text;
+	info.dwTypeData = (LPTSTR)item_text;
 	info.cch = (UINT)STRLEN(item_text);
 	InsertMenuItem(pmenu, item_id, FALSE, &info);
     }
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1345,
+/**/
     1344,
 /**/
     1343,