diff --git a/src/os_win32.c b/src/os_win32.c
index 8291f45b16..a518308f65 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -9077,7 +9077,7 @@ GetWin32Error(void)
     static char	*oldmsg = NULL;
     char	*acp_msg = NULL;
     DWORD	acp_len;
-    char_u	*enc_msg = NULL;
+    char	*enc_msg = NULL;
     int		enc_len = 0;
 
     // get formatted message from OS
@@ -9094,7 +9094,7 @@ GetWin32Error(void)
 	oldmsg = NULL;
     }
 
-    acp_to_enc(acp_msg, (int)acp_len, &enc_msg, &enc_len);
+    acp_to_enc((char_u *)acp_msg, (int)acp_len, (char_u **)&enc_msg, &enc_len);
     LocalFree(acp_msg);
     if (enc_msg == NULL)
 	return NULL;
diff --git a/src/version.c b/src/version.c
index bca913e998..ab06088256 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2046,
 /**/
     2045,
 /**/