# HG changeset patch # User Christian Brabandt # Date 1491150605 -7200 # Node ID b254fd46ef627eaff94528ee9b9c424555d03c01 # Parent b6b88d1c0c246fcab5d0b99cc17f229ad4ff70a1 patch 8.0.0540: building unit tests fails commit https://github.com/vim/vim/commit/a604429529ce3d3c97309c7cf6bba8b699f6bfb5 Author: Bram Moolenaar Date: Sun Apr 2 18:19:53 2017 +0200 patch 8.0.0540: building unit tests fails Problem: Building unit tests fails. Solution: Move params outside of #ifdef. diff --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c @@ -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 diff --git a/src/message_test.c b/src/message_test.c --- a/src/message_test.c +++ b/src/message_test.c @@ -96,8 +96,6 @@ test_trunc_string(void) int main(int argc, char **argv) { - mparm_T params; - vim_memset(¶ms, 0, sizeof(params)); params.argc = argc; params.argv = argv; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 540, +/**/ 539, /**/ 538,