# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1470341706 -7200
# Node ID 93dcc4329c749e5e5db58d476fbc2b86f8f302b0
# Parent  7ed1c66686925c4ae98d4a7558e15e49ea43f0a9
commit https://github.com/vim/vim/commit/c90f2aedd0a5dc2cc75bc9b5f475f8a3e3fe36b1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Aug 4 22:00:15 2016 +0200

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

diff --git a/src/os_win32.c b/src/os_win32.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2156,
+/**/
     2155,
 /**/
     2154,