0
0
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00

patch 8.2.0067: ERROR_UNKNOWN clashes on some systems

Problem:    ERROR_UNKNOWN clashes on some systems.
Solution:   Rename ERROR_ to FCERR_. (Ola Söder, closes #5415)
This commit is contained in:
Bram Moolenaar
2019-12-31 21:27:13 +01:00
parent d2c946bacf
commit ef140544f6
4 changed files with 41 additions and 39 deletions

View File

@@ -976,14 +976,14 @@ call_internal_func(
i = find_internal_func(name);
if (i < 0)
return ERROR_UNKNOWN;
return FCERR_UNKNOWN;
if (argcount < global_functions[i].f_min_argc)
return ERROR_TOOFEW;
return FCERR_TOOFEW;
if (argcount > global_functions[i].f_max_argc)
return ERROR_TOOMANY;
return FCERR_TOOMANY;
argvars[argcount].v_type = VAR_UNKNOWN;
global_functions[i].f_func(argvars, rettv);
return ERROR_NONE;
return FCERR_NONE;
}
/*
@@ -1003,13 +1003,13 @@ call_internal_method(
fi = find_internal_func(name);
if (fi < 0)
return ERROR_UNKNOWN;
return FCERR_UNKNOWN;
if (global_functions[fi].f_argtype == 0)
return ERROR_NOTMETHOD;
return FCERR_NOTMETHOD;
if (argcount + 1 < global_functions[fi].f_min_argc)
return ERROR_TOOFEW;
return FCERR_TOOFEW;
if (argcount + 1 > global_functions[fi].f_max_argc)
return ERROR_TOOMANY;
return FCERR_TOOMANY;
if (global_functions[fi].f_argtype == FEARG_LAST)
{
@@ -1055,7 +1055,7 @@ call_internal_method(
argv[argcount + 1].v_type = VAR_UNKNOWN;
global_functions[fi].f_func(argv, rettv);
return ERROR_NONE;
return FCERR_NONE;
}
/*