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
index 9fe43218d2c84db440f7578a4de756f182b470a5..d502634e3e1b5b8ca7ee07c987fb55519547a059 100644 (file)
--- 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 a4392eb1ea6c44c364544216d5ab239349d01aa4..17febd0562860aa7afa6d9c5f5dae4c83132c8f7 100644 (file)
--- 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,
 /**/