Mercurial > vim

changeset 9762:93dcc4329c74 v7.4.2156

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Aug 2016 22:15:06 +0200
parents 7ed1c6668692
children 7fba2e73bc86
files src/os_win32.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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*/
--- 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,