From a604429529ce3d3c97309c7cf6bba8b699f6bfb5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 2 Apr 2017 18:19:53 +0200 Subject: patch 8.0.0540: building unit tests fails Problem: Building unit tests fails. Solution: Move params outside of #ifdef. --- src/main.c | 7 ++++--- src/message_test.c | 2 -- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index e3db0b2a9..6d59b09ba 100644 --- 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 index e5ecf2641..55ca81410 100644 --- 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 index 3a6070b98..5958550f1 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 540, /**/ 539, /**/ -- cgit v1.2.1