aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2020-08-10 23:23:54 -0400
committerGitHub <noreply@github.com>2020-08-10 23:23:54 -0400
commit94b7ff730a1914c14f347f5dc75175dc34a4b3f5 (patch)
tree93d2ea46f9b06c012e402a0f10e9348dcd4437c0
parent272389da3278c4c4b5353854edb32dce25b11587 (diff)
parent840c12c10741d8f70e1787534fb6ea6d2b70edee (diff)
downloadrneovim-94b7ff730a1914c14f347f5dc75175dc34a4b3f5.tar.gz
rneovim-94b7ff730a1914c14f347f5dc75175dc34a4b3f5.tar.bz2
rneovim-94b7ff730a1914c14f347f5dc75175dc34a4b3f5.zip
Merge pull request #12731 from jamessan/libcallnr
libcall: Use "int" for number argument
-rw-r--r--src/nvim/eval/funcs.c2
-rw-r--r--src/nvim/os/dl.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index b97bd6b10d..1a80d4d4bd 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -5277,7 +5277,7 @@ static void libcall_common(typval_T *argvars, typval_T *rettv, int out_type)
// input variables
char *str_in = (in_type == VAR_STRING)
? (char *)argvars[2].vval.v_string : NULL;
- int64_t int_in = argvars[2].vval.v_number;
+ int int_in = argvars[2].vval.v_number;
// output variables
char **str_out = (out_type == VAR_STRING)
diff --git a/src/nvim/os/dl.c b/src/nvim/os/dl.c
index 2783411574..8483d316f3 100644
--- a/src/nvim/os/dl.c
+++ b/src/nvim/os/dl.c
@@ -20,8 +20,8 @@
typedef void (*gen_fn)(void);
typedef const char *(*str_str_fn)(const char *str);
typedef int (*str_int_fn)(const char *str);
-typedef const char *(*int_str_fn)(int64_t i);
-typedef int (*int_int_fn)(int64_t i);
+typedef const char *(*int_str_fn)(int i);
+typedef int (*int_int_fn)(int i);
/// os_libcall - call a function in a dynamic loadable library
///
@@ -41,7 +41,7 @@ typedef int (*int_int_fn)(int64_t i);
bool os_libcall(const char *libname,
const char *funcname,
const char *argv,
- int64_t argi,
+ int argi,
char **str_out,
int *int_out)
{