Merge pull request #12731 from jamessan/libcallnr

libcall: Use "int" for number argument
neovim · Aug 11, 2020 · 94b7ff7 · 94b7ff7
2 parents 272389d + 840c12c
commit 94b7ff7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)
 {