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:
@@ -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
|
||||||
|
@@ -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(¶ms, 0, sizeof(params));
|
vim_memset(¶ms, 0, sizeof(params));
|
||||||
params.argc = argc;
|
params.argc = argc;
|
||||||
params.argv = argv;
|
params.argv = argv;
|
||||||
|
@@ -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,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user