Commit: patch 9.1.2046: MS-Windows: compile warnings

4 views
Skip to first unread message

Christian Brabandt

unread,
Jan 3, 2026, 12:01:07 PM (6 days ago) Jan 3
to vim...@googlegroups.com
patch 9.1.2046: MS-Windows: compile warnings

Commit: https://github.com/vim/vim/commit/8be46105881c8eefcd157a377f08fcdf6f5c9d18
Author: Mao-Yining <101858210+...@users.noreply.github.com>
Date: Sat Jan 3 16:51:47 2026 +0000

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.y...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/os_win32.c b/src/os_win32.c
index 8291f45b1..a518308f6 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 bca913e99..ab0608825 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,
/**/
Reply all
Reply to author
Forward
0 new messages