aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2020-08-08 08:53:35 -0400
committerJames McCoy <jamessan@jamessan.com>2020-08-08 08:53:35 -0400
commite813ec79c201c85c5af3b10c051ae92ab5cb8606 (patch)
treea50a35a015f9b6b2a5a4041e677bbf7ad49009eb
parent3e3002b90c46fca8d8d5edebc021e56d95c5e645 (diff)
downloadrneovim-e813ec79c201c85c5af3b10c051ae92ab5cb8606.tar.gz
rneovim-e813ec79c201c85c5af3b10c051ae92ab5cb8606.tar.bz2
rneovim-e813ec79c201c85c5af3b10c051ae92ab5cb8606.zip
libcall: Use "int" for number argument
The libcall family of functions need to use "int" for both input and output. The output side was fixed in 9c42232 but I forgot about the input side. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch libcallnr # Your branch is up to date with 'upstream/master'. # # Changes to be committed: # modified: src/nvim/eval/funcs.c # modified: src/nvim/os/dl.c #
-rw-r--r--src/nvim/eval.c2
-rw-r--r--src/nvim/os/dl.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index e39f36957c..7766c793e4 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -12656,7 +12656,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)
{