diff options
| author | Marco Hinz <mh.codebro@gmail.com> | 2017-01-09 12:30:57 +0100 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-04 17:55:45 -0500 |
| commit | d60d1b3232a43cbc025dbbec91535260d493d89e (patch) | |
| tree | 42e1c4709c3f90ddfff5b90fe516942aad71962f /src | |
| parent | 1836f3cb9b7e84ec5ed53ab0d3eb8496c95fe9e6 (diff) | |
| download | rneovim-d60d1b3232a43cbc025dbbec91535260d493d89e.tar.gz rneovim-d60d1b3232a43cbc025dbbec91535260d493d89e.tar.bz2 rneovim-d60d1b3232a43cbc025dbbec91535260d493d89e.zip | |
vim-patch:7.4.2022
Problem: Warnings from 64 bit compiler.
Solution: Add type casts. (Mike Williams)
https://github.com/vim/vim/commit/25065ec375a8a55462f6c07c76dc1a72a770ac19
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9c041ca790..6c596b0aae 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10317,7 +10317,7 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr) ExpandInit(&xpc); xpc.xp_pattern = get_tv_string(&argvars[0]); - xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); xpc.xp_context = cmdcomplete_str_to_type(get_tv_string(&argvars[1])); if (xpc.xp_context == EXPAND_NOTHING) { if (argvars[1].v_type == VAR_STRING) { @@ -10330,17 +10330,17 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (xpc.xp_context == EXPAND_MENUS) { set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, false); - xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); } if (xpc.xp_context == EXPAND_CSCOPE) { set_context_in_cscope_cmd(&xpc, xpc.xp_pattern, CMD_cscope); - xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); } if (xpc.xp_context == EXPAND_SIGN) { set_context_in_sign_cmd(&xpc, xpc.xp_pattern); - xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); } pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context); diff --git a/src/nvim/version.c b/src/nvim/version.c index 69860aa216..658b553ec0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -418,7 +418,7 @@ static int included_patches[] = { // 2025 NA // 2024, // 2023, - // 2022, + 2022, 2021, // 2020 NA 2019, |