Permalink
Browse files

patch 7.4.2191

Problem:    No automatic prototype for vim_main2().
Solution:   Move the #endif. (Ken Takata)
  • Loading branch information...
1 parent 50fa8dd commit a357e44ccdf5cfe9f6d35cc348ca33ccd973e1a9 @brammool brammool committed Aug 10, 2016
Showing with 5 additions and 5 deletions.
  1. +1 −1 src/main.c
  2. +2 −1 src/proto/main.pro
  3. +2 −0 src/version.c
  4. +0 −3 src/vim.h
View
@@ -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.
View
@@ -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);
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2191,
+/**/
2190,
/**/
2189,
View
@@ -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. */

0 comments on commit a357e44

Please sign in to comment.