commit c90f2aedd0a5dc2cc75bc9b5f475f8a3e3fe36b1
author Bram Moolenaar <Bram@vim.org> Thu Aug 04 22:00:15 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Aug 04 22:00:15 2016 +0200
tree da49c3c824709fbb344aa9a841bcacc5346c4719
parent 9d5b876d458e242b8b5e44da10c5cdc6bbb7f57c

patch 7.4.2156
Problem:    Compiler warning.
Solution:   Add type cast. (Ken Takata, Mike Williams)

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index 9fe4321..d502634 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -577,7 +577,7 @@
 	const char *msgid_plural,
 	unsigned long n)
 {
-    return n == 1 ? msgid : msgid_plural;
+    return (char *)(n == 1 ? msgid : msgid_plural);
 }
 
 /*ARGSUSED*/

src/version.c

diff --git a/src/version.c b/src/version.c
index a4392eb..17febd0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2156,
+/**/
     2155,
 /**/
     2154,