mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0494: build failure with older compiler on MS-Windows
Problem: Build failure with older compiler on MS-Windows. Solution: Move declaration to start of block.
This commit is contained in:
@@ -8677,14 +8677,15 @@ f_remote_read(typval_T *argvars UNUSED, typval_T *rettv)
|
|||||||
if (serverid != NULL && !check_restricted() && !check_secure())
|
if (serverid != NULL && !check_restricted() && !check_secure())
|
||||||
{
|
{
|
||||||
int timeout = 0;
|
int timeout = 0;
|
||||||
|
# ifdef WIN32
|
||||||
|
/* The server's HWND is encoded in the 'id' parameter */
|
||||||
|
long_u n = 0;
|
||||||
|
# endif
|
||||||
|
|
||||||
if (argvars[1].v_type != VAR_UNKNOWN)
|
if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
timeout = get_tv_number(&argvars[1]);
|
timeout = get_tv_number(&argvars[1]);
|
||||||
|
|
||||||
# ifdef WIN32
|
# ifdef WIN32
|
||||||
/* The server's HWND is encoded in the 'id' parameter */
|
|
||||||
long_u n = 0;
|
|
||||||
|
|
||||||
sscanf((char *)serverid, SCANF_HEX_LONG_U, &n);
|
sscanf((char *)serverid, SCANF_HEX_LONG_U, &n);
|
||||||
if (n != 0)
|
if (n != 0)
|
||||||
r = serverGetReply((HWND)n, FALSE, TRUE, TRUE, timeout);
|
r = serverGetReply((HWND)n, FALSE, TRUE, TRUE, timeout);
|
||||||
|
@@ -4194,7 +4194,7 @@ sendToLocalVim(char_u *cmd, int asExpr, char_u **result)
|
|||||||
size_t len = STRLEN(cmd) + STRLEN(err) + 5;
|
size_t len = STRLEN(cmd) + STRLEN(err) + 5;
|
||||||
char_u *msg;
|
char_u *msg;
|
||||||
|
|
||||||
msg = alloc(len);
|
msg = alloc((unsigned)len);
|
||||||
if (msg != NULL)
|
if (msg != NULL)
|
||||||
vim_snprintf((char *)msg, len, "%s: \"%s\"", err, cmd);
|
vim_snprintf((char *)msg, len, "%s: \"%s\"", err, cmd);
|
||||||
*result = msg;
|
*result = msg;
|
||||||
|
@@ -2111,7 +2111,7 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||||||
char *err = _(e_invexprmsg);
|
char *err = _(e_invexprmsg);
|
||||||
size_t len = STRLEN(str) + STRLEN(err) + 5;
|
size_t len = STRLEN(str) + STRLEN(err) + 5;
|
||||||
|
|
||||||
res = alloc(len);
|
res = alloc((unsigned)len);
|
||||||
if (res != NULL)
|
if (res != NULL)
|
||||||
vim_snprintf((char *)res, len, "%s: \"%s\"", err, str);
|
vim_snprintf((char *)res, len, "%s: \"%s\"", err, str);
|
||||||
reply.dwData = COPYDATA_ERROR_RESULT;
|
reply.dwData = COPYDATA_ERROR_RESULT;
|
||||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
494,
|
||||||
/**/
|
/**/
|
||||||
493,
|
493,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user