To: vim_dev@googlegroups.com Subject: Patch 7.4.2191 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2191 Problem: No automatic prototype for vim_main2(). Solution: Move the #endif. (Ken Takata) Files: src/main.c, src/vim.h, src/proto/main.pro *** ../vim-7.4.2190/src/main.c 2016-08-07 15:19:22.200295401 +0200 --- src/main.c 2016-08-10 20:41:56.305168690 +0200 *************** *** 416,421 **** --- 416,422 ---- #endif } #endif /* NO_VIM_MAIN */ + #endif /* PROTO */ /* * vim_main2() is needed for FEAT_MZSCHEME, but we define it always to keep *************** *** 879,885 **** return 0; } - #endif /* PROTO */ /* * Initialisation shared by main() and some tests. --- 880,885 ---- *** ../vim-7.4.2190/src/vim.h 2016-08-09 22:13:51.858043815 +0200 --- src/vim.h 2016-08-10 20:42:46.348712933 +0200 *************** *** 2440,2448 **** #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. */ --- 2440,2445 ---- *** ../vim-7.4.2190/src/proto/main.pro 2016-07-16 19:49:54.376304103 +0200 --- src/proto/main.pro 2016-08-10 20:43:02.444566364 +0200 *************** *** 1,5 **** /* main.c */ ! void common_init(mparm_T *params); void main_loop(int cmdwin, int noexmode); void getout_preserve_modified(int exitval); void getout(int exitval); --- 1,6 ---- /* main.c */ ! 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); *** ../vim-7.4.2190/src/version.c 2016-08-09 22:58:17.845804116 +0200 --- src/version.c 2016-08-10 20:44:32.719744493 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2191, /**/ -- If someone questions your market projections, simply point out that your target market is "People who are nuts" and "People who will buy any damn thing". Nobody is going to tell you there aren't enough of those people to go around. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///