From a357e44ccdf5cfe9f6d35cc348ca33ccd973e1a9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 10 Aug 2016 20:45:07 +0200 Subject: [PATCH] patch 7.4.2191 Problem: No automatic prototype for vim_main2(). Solution: Move the #endif. (Ken Takata) --- src/main.c | 2 +- src/proto/main.pro | 3 ++- src/version.c | 2 ++ src/vim.h | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index c69453286..87931325b 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 6901ecca5..958e1f3bb 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 0ed07b4e8..8735b64ba 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2191, /**/ 2190, /**/ diff --git a/src/vim.h b/src/vim.h index 8b51b09ef..085f73d8a 100644 --- 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. */ -- 2.50.1