diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-17 20:48:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-17 20:48:19 +0100 |
| commit | a87e2c277eabf0134925c340e9dc4fe9446f3636 (patch) | |
| tree | 4821c65616db05a42b2cb9c90f31c8d32cc543c0 | |
| parent | 203219048fa007b5042d9b893fd647aef44722a0 (diff) | |
| download | vim-git-a87e2c277eabf0134925c340e9dc4fe9446f3636.tar.gz | |
patch 7.4.1345v7.4.1345
Problem: A few more compiler warnings. (Axel Bender)
Solution: Add type casts.
| -rw-r--r-- | src/gui_w32.c | 2 | ||||
| -rw-r--r-- | src/gui_w48.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index cc31c7cee..ac0fb11f6 100644 --- 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 5896dcdda..7c08dec76 100644 --- 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 ec88da4d0..d417844e1 100644 --- 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, |