diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-10 20:45:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-10 20:45:07 +0200 |
| commit | a357e44ccdf5cfe9f6d35cc348ca33ccd973e1a9 (patch) | |
| tree | 7dd40155c7325d14e24296c4c0e28ed84009e73b | |
| parent | 50fa8dd00c241fa0786fe92ecc02fee4e5d28e06 (diff) | |
patch 7.4.2191v7.4.2191
Problem: No automatic prototype for vim_main2().
Solution: Move the #endif. (Ken Takata)
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/proto/main.pro | 3 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c index c694532860..87931325ba 100644 --- 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. diff --git a/src/proto/main.pro b/src/proto/main.pro index 6901ecca5c..958e1f3bbf 100644 --- 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); diff --git a/src/version.c b/src/version.c index 0ed07b4e8d..8735b64ba9 100644 --- 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, @@ -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. */ |