summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2156,
+/**/
2155,
/**/
2154,