From c90f2aedd0a5dc2cc75bc9b5f475f8a3e3fe36b1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 4 Aug 2016 22:00:15 +0200
Subject: [PATCH] patch 7.4.2156 Problem:    Compiler warning. Solution:   Add
 type cast. (Ken Takata, Mike Williams)

---
 src/os_win32.c | 2 +-
 src/version.c  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index 9fe43218d..d502634e3 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -577,7 +577,7 @@ null_libintl_ngettext(
 	const char *msgid_plural,
 	unsigned long n)
 {
-    return n == 1 ? msgid : msgid_plural;
+    return (char *)(n == 1 ? msgid : msgid_plural);
 }
 
 /*ARGSUSED*/
diff --git a/src/version.c b/src/version.c
index a4392eb1e..17febd056 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2156,
 /**/
     2155,
 /**/
-- 
2.50.1