diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-31 18:08:34 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-31 18:08:34 +0100 |
commit | 448a22549b4528fd81d520497f30672567199c96 (patch) | |
tree | d59ab514add9eda10068be198c1e168dbce05875 | |
parent | 3803bad99de92f4c5ebd6f40b757bc7ade47619e (diff) | |
download | vim-git-448a22549b4528fd81d520497f30672567199c96.tar.gz |
patch 7.4.1227v7.4.1227
Problem: Compiler warnings.
Solution: Add UNUSED. Add type cast. (Yegappan Lakshmanan)
-rw-r--r-- | src/getchar.c | 2 | ||||
-rw-r--r-- | src/os_macosx.m | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/getchar.c b/src/getchar.c index 12e250812..2c5709003 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -5322,7 +5322,7 @@ init_mappings(void) #if defined(MSDOS) || defined(MSWIN) ||defined(MACOS) int i; - for (i = 0; i < sizeof(initmappings) / sizeof(struct initmap); ++i) + for (i = 0; i < (int)(sizeof(initmappings) / sizeof(struct initmap)); ++i) add_map(initmappings[i].arg, initmappings[i].mode); #endif } diff --git a/src/os_macosx.m b/src/os_macosx.m index d919f6335..dcd3da95d 100644 --- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -37,13 +37,13 @@ NSString *VimPboardType = @"VimPboardType"; void -clip_mch_lose_selection(VimClipboard *cbd) +clip_mch_lose_selection(VimClipboard *cbd UNUSED) { } int -clip_mch_own_selection(VimClipboard *cbd) +clip_mch_own_selection(VimClipboard *cbd UNUSED) { /* This is called whenever there is a new selection and 'guioptions' * contains the "a" flag (automatically copy selection). Return TRUE, else diff --git a/src/version.c b/src/version.c index 96a2daae1..1130a20a2 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1227, +/**/ 1226, /**/ 1225, |