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 c694532860260a95521a1d4a3698f96556337fd3..87931325bab75667555aa2e2b1a9217f55145dac 100644 (file)
--- 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 6901ecca5c3d745b48557ec15b86c1f81fb71b86..958e1f3bbff5cac294ebadc3d536c526d37fa8e0 100644 (file)
--- 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 0ed07b4e8d2f8fe92b7f4d6e12c3b9e6fc0292ef..8735b64ba91c62267ce6ba1e54561967f4e2fd08 100644 (file)
--- 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 8b51b09efc2d7c8b9a9ca7a6ed4ba64518d2ebb0..085f73d8a221c3817e3c0fe5e9a25c6242f826a6 100644 (file)
--- 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. */