Skip to content

Commit a604429

Browse files
committed
patch 8.0.0540: building unit tests fails
Problem: Building unit tests fails. Solution: Move params outside of #ifdef.
1 parent 08f88b1 commit a604429

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,16 @@ static char *(main_errors[]) =
8989
};
9090

9191
#ifndef PROTO /* don't want a prototype for main() */
92+
93+
/* Various parameters passed between main() and other functions. */
94+
static mparm_T params;
95+
9296
#ifndef NO_VIM_MAIN /* skip this for unittests */
9397

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

96100
static int has_dash_c_arg = FALSE;
97101

98-
/* Various parameters passed between main() and other functions. */
99-
static mparm_T params;
100-
101102
int
102103
# ifdef VIMDLL
103104
_export

src/message_test.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ test_trunc_string(void)
9696
int
9797
main(int argc, char **argv)
9898
{
99-
mparm_T params;
100-
10199
vim_memset(&params, 0, sizeof(params));
102100
params.argc = argc;
103101
params.argv = argv;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
540,
767769
/**/
768770
539,
769771
/**/

0 commit comments

Comments
 (0)