patch 7.4.1227

Problem:    Compiler warnings.
Solution:   Add UNUSED.  Add type cast. (Yegappan Lakshmanan)

diff --git a/src/getchar.c b/src/getchar.c
index 12e25081279678bed7dc50de02e11cd10cd84967..2c5709003a31ac73d91cf37eb1cd1f783b681094 100644 (file)
--- 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 d919f6335c0d9c0b378697266626fbf954dcd927..dcd3da95ded57ab148f9002a87fa4e63eab52d8c 100644 (file)
--- 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 96a2daae1129c77a42f776f9d2db3b10efddfe6f..1130a20a2e3fa28a35dbc44170fb4ce3f26061fe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1227,
 /**/
     1226,
 /**/