Mercurial > vim

changeset 11309:b254fd46ef62 v8.0.0540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0540: building unit tests fails commit https://github.com/vim/vim/commit/a604429529ce3d3c97309c7cf6bba8b699f6bfb5 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sun, 02 Apr 2017 18:30:05 +0200
parents b6b88d1c0c24
children 6d6f42a572d0
files src/main.c src/message_test.c src/version.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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(&params, 0, sizeof(params));
     params.argc = argc;
     params.argv = argv;
--- 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,