summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-04-17 22:08:16 +0200
committerBram Moolenaar <bram@vim.org>2015-04-17 22:08:16 +0200
commit699f0e13e12f1c838c614da4c27bd42601712e98 (patch)
treec56ba82787b8f5e23d1422997f37675994c6710b
parenteafe7fdbd7d83a89f3479726fb2e121610249477 (diff)
downloadvim-699f0e13e12f1c838c614da4c27bd42601712e98.tar.gz
patch 7.4.703v7.4.703v7-4-703
Problem: Compiler warning for start_dir unused when building unittests. Solution: Move start_dir inside the #ifdef.
-rw-r--r--src/main.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 72f70b71..d20c4b09 100644
--- a/src/main.c
+++ b/src/main.c
@@ -147,10 +147,11 @@ static char *(main_errors[]) =
#define ME_INVALID_ARG 5
};
-static char_u *start_dir = NULL; /* current working dir on startup */
-
#ifndef PROTO /* don't want a prototype for main() */
#ifndef NO_VIM_MAIN /* skip this for unittests */
+
+static char_u *start_dir = NULL; /* current working dir on startup */
+
int
# ifdef VIMDLL
_export
diff --git a/src/version.c b/src/version.c
index 0f02ea8f..d211340a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 703,
+/**/
702,
/**/
701,