Mercurial > vim
diff src/evalfunc.c @ 19013:dd9ab0674eec v8.2.0067
patch 8.2.0067: ERROR_UNKNOWN clashes on some systems
Commit: https://github.com/vim/vim/commit/ef140544f6703a7a4c0f6a15f610508ed6b09e89
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 31 21:27:13 2019 +0100
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 https://github.com/vim/vim/issues/5415)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 31 Dec 2019 21:30:04 +0100 |
| parents | bf8eb950df61 |
| children | f0312cf3c792 |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -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; } /*