aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.2191

Browse Source 
Problem:    No automatic prototype for vim_main2().
Solution:   Move the #endif. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2016-08-10 20:45:07 +02:00
parent 50fa8dd00c
commit a357e44ccd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -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.

3
src/proto/main.pro
View File

@ -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);

2
src/version.c
View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2191,
/**/
2190,
/**/

3
src/vim.h
View File

@ -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. */