mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
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>
This commit is contained in:
committed by
Christian Brabandt
parent
93eb081eee
commit
8be4610588
+2
-2
@@ -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;
|
||||
|
||||
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2046,
|
||||
/**/
|
||||
2045,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user