patch 7.4.1345

Problem:    A few more compiler warnings. (Axel Bender)
Solution:   Add type casts.

diff --git a/src/gui_w32.c b/src/gui_w32.c
index cc31c7cee2d370fd3a44645853dad7892d6d7cda..ac0fb11f690e7e9bbba4c2f7c8139e0139a41416 100644 (file)
--- 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 */

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 5896dcddad3dab762a91e8e43ce68ce84f97d9d5..7c08dec76c67ebb7398cbd5ab6f5d2dfc5c474b5 100644 (file)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2442,7 +2442,7 @@ add_tabline_popup_menu_entry(HMENU pmenu, UINT item_id, char_u *item_text)
        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);
     }

diff --git a/src/version.c b/src/version.c
index ec88da4d0e1324acd4d46e2746f2966dfb57069d..d417844e1d175b1e7a16e6ba94a07ddfc848accf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1345,
 /**/
     1344,
 /**/