patch 7.4.2191
Problem: No automatic prototype for vim_main2().
Solution: Move the #endif. (Ken Takata)
diff --git a/src/main.c b/src/main.c
index c694532..8793132 100644
--- a/src/main.c
+++ b/src/main.c
@@ -416,6 +416,7 @@
#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 @@
return 0;
}
-#endif /* PROTO */
/*
* Initialisation shared by main() and some tests.
diff --git a/src/proto/main.pro b/src/proto/main.pro
index 6901ecc..958e1f3 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 0ed07b4..8735b64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2191,
+/**/
2190,
/**/
2189,
diff --git a/src/vim.h b/src/vim.h
index 8b51b09..085f73d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2440,9 +2440,6 @@
#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. */
