summaryrefslogtreecommitdiffstats
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
commitf9bde2b152d3344c694c5e1ca629156b34f1a627 (patch)
treebad351455e12d8e77d3be6bb12b0a10c72461662
parentd39a7512804f860a20319c181613771a79a9ea4e (diff)
patch 7.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 72f70b714d..d20c4b0958 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 0f02ea8ff0..d211340a7e 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,