diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-02 18:19:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-02 18:19:53 +0200 |
| commit | a604429529ce3d3c97309c7cf6bba8b699f6bfb5 (patch) | |
| tree | 46f3e0bf543047e0cfc8877e1591fbade73ba548 | |
| parent | 08f88b139d2f93661ed2b17214ee6b308b4edb5b (diff) | |
| download | vim-git-a604429529ce3d3c97309c7cf6bba8b699f6bfb5.tar.gz | |
patch 8.0.0540: building unit tests failsv8.0.0540
Problem: Building unit tests fails.
Solution: Move params outside of #ifdef.
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/message_test.c | 2 | ||||
| -rw-r--r-- | 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 @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 540, +/**/ 539, /**/ 538, |