patch 9.1.2046: MS-Windows: compile warnings
Commit:
https://github.com/vim/vim/commit/8be46105881c8eefcd157a377f08fcdf6f5c9d18
Author: Mao-Yining <[email protected]>
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vc4yy-00CIjx-GN%40256bit.org.
