diff --git a/src/os_win32.c b/src/os_win32.c
index 9fe4321..d502634 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -577,7 +577,7 @@
 	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 a4392eb..17febd0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2156,
+/**/
     2155,
 /**/
     2154,