diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-09-16 16:37:37 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-16 16:37:37 +0800 |
commit | b98de0e0e5df96cadbac9222ddb1caa463cea2f0 (patch) | |
tree | 89c1d5df4f7843a52eafaafdaad98b660201ed0e /src/nvim/eval/userfunc.h | |
parent | 0b7a3c173c929085f54a178c9fa852481d5f021e (diff) | |
download | rneovim-b98de0e0e5df96cadbac9222ddb1caa463cea2f0.tar.gz rneovim-b98de0e0e5df96cadbac9222ddb1caa463cea2f0.tar.bz2 rneovim-b98de0e0e5df96cadbac9222ddb1caa463cea2f0.zip |
vim-patch:8.2.0067: ERROR_UNKNOWN clashes on some systems (#20212)
Problem: ERROR_UNKNOWN clashes on some systems.
Solution: Rename ERROR_ to FCERR_. (Ola Söder, closes vim/vim#5415)
https://github.com/vim/vim/commit/ef140544f6703a7a4c0f6a15f610508ed6b09e89
Remove ERROR_BOTH which was removed from Vim in patch 7.4.1582.
Diffstat (limited to 'src/nvim/eval/userfunc.h')
-rw-r--r-- | src/nvim/eval/userfunc.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/nvim/eval/userfunc.h b/src/nvim/eval/userfunc.h index 9811f2afb3..5e2713fc7b 100644 --- a/src/nvim/eval/userfunc.h +++ b/src/nvim/eval/userfunc.h @@ -38,16 +38,15 @@ struct funccal_entry { /// errors for when calling a function typedef enum { - ERROR_UNKNOWN = 0, - ERROR_TOOMANY, - ERROR_TOOFEW, - ERROR_SCRIPT, - ERROR_DICT, - ERROR_NONE, - ERROR_OTHER, - ERROR_BOTH, - ERROR_DELETED, - ERROR_NOTMETHOD, + FCERR_UNKNOWN = 0, + FCERR_TOOMANY = 1, + FCERR_TOOFEW = 2, + FCERR_SCRIPT = 3, + FCERR_DICT = 4, + FCERR_NONE = 5, + FCERR_OTHER = 6, + FCERR_DELETED = 7, + FCERR_NOTMETHOD = 8, ///< function cannot be used as a method } FnameTransError; /// Used in funcexe_T. Returns the new argcount. |