0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.0.0540: building unit tests fails

Problem:    Building unit tests fails.
Solution:   Move params outside of #ifdef.
This commit is contained in:
Bram Moolenaar
2017-04-02 18:19:53 +02:00
parent 08f88b139d
commit a604429529
3 changed files with 6 additions and 5 deletions

View File

@@ -89,15 +89,16 @@ static char *(main_errors[]) =
}; };
#ifndef PROTO /* don't want a prototype for main() */ #ifndef PROTO /* don't want a prototype for main() */
/* Various parameters passed between main() and other functions. */
static mparm_T params;
#ifndef NO_VIM_MAIN /* skip this for unittests */ #ifndef NO_VIM_MAIN /* skip this for unittests */
static char_u *start_dir = NULL; /* current working dir on startup */ static char_u *start_dir = NULL; /* current working dir on startup */
static int has_dash_c_arg = FALSE; static int has_dash_c_arg = FALSE;
/* Various parameters passed between main() and other functions. */
static mparm_T params;
int int
# ifdef VIMDLL # ifdef VIMDLL
_export _export

View File

@@ -96,8 +96,6 @@ test_trunc_string(void)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
mparm_T params;
vim_memset(&params, 0, sizeof(params)); vim_memset(&params, 0, sizeof(params));
params.argc = argc; params.argc = argc;
params.argv = argv; params.argv = argv;

View File

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