Skip to content

Commit

Permalink
patch 8.0.0540: building unit tests fails
Browse files Browse the repository at this point in the history
Problem:    Building unit tests fails.
Solution:   Move params outside of #ifdef.
  • Loading branch information
brammool committed Apr 2, 2017
1 parent 08f88b1 commit a604429
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,16 @@ static char *(main_errors[]) =
};

#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 */

static char_u *start_dir = NULL; /* current working dir on startup */

static int has_dash_c_arg = FALSE;

/* Various parameters passed between main() and other functions. */
static mparm_T params;

int
# ifdef VIMDLL
_export
Expand Down
2 changes: 0 additions & 2 deletions src/message_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ test_trunc_string(void)
int
main(int argc, char **argv)
{
mparm_T params;

vim_memset(&params, 0, sizeof(params));
params.argc = argc;
params.argv = argv;
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
540,
/**/
539,
/**/
Expand Down

0 comments on commit a604429

Please sign in to comment.