patch 9.1.2046: MS-Windows: compile warnings

Problem:  MS-Windows: compile warnings in os_win32.c,
          acp_to_enc() requires char_u* but others require char*
          (John Marriott, after v9.1.2013)
Solution: Cast the variables (Mao-Yining)

closes: #19074

Signed-off-by: Mao-Yining <mao.yining@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/os_win32.c b/src/os_win32.c
index 8291f45b16922e015f6e738b877ac565a4d09d3a..a518308f654abfd7ab329471e7c9eb41a07402a3 100644 (file)
--- 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 bca913e99801b541bca1b8b33a5e2fb0cc692daf..ab06088256e0e41035798631c17c7be48c437fff 100644 (file)
--- 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,
 /**/