Mercurial > vim
changeset 9832:568ea507b0cd v7.4.2191
commit https://github.com/vim/vim/commit/a357e44ccdf5cfe9f6d35cc348ca33ccd973e1a9
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 10 20:45:07 2016 +0200
patch 7.4.2191
Problem: No automatic prototype for vim_main2().
Solution: Move the #endif. (Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 10 Aug 2016 21:00:07 +0200 |
| parents | 7fd691232941 |
| children | e764104bc7c1 |
| files | src/main.c src/proto/main.pro src/version.c src/vim.h |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -416,6 +416,7 @@ main #endif } #endif /* NO_VIM_MAIN */ +#endif /* PROTO */ /* * vim_main2() is needed for FEAT_MZSCHEME, but we define it always to keep @@ -879,7 +880,6 @@ vim_main2(void) return 0; } -#endif /* PROTO */ /* * Initialisation shared by main() and some tests.
--- a/src/proto/main.pro +++ b/src/proto/main.pro @@ -1,5 +1,6 @@ /* main.c */ -void common_init(mparm_T *params); +int vim_main2(void); +void common_init(mparm_T *paramp); void main_loop(int cmdwin, int noexmode); void getout_preserve_modified(int exitval); void getout(int exitval);
--- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2191, +/**/ 2190, /**/ 2189,
--- a/src/vim.h +++ b/src/vim.h @@ -2440,9 +2440,6 @@ typedef enum #define JSON_JS 1 /* use JS instead of JSON */ #define JSON_NO_NONE 2 /* v:none item not allowed */ -/* This is in main.c, cproto can't handle it. */ -int vim_main2(void); - /* Used for flags of do_in_path() */ #define DIP_ALL 0x01 /* all matches, not just the first one */ #define DIP_DIR 0x02 /* find directories instead of files. */