summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-17 13:15:17 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-17 13:15:17 +0100
commita2150ac01643ef99b0e7b2273c6ad84ce79c8f90 (patch)
tree41d408c5ea95429c4c2051e5a203a5aa2fba4524
parent1dd98334d6daee8abefcd640291d4b777d9f0f96 (diff)
patch 8.0.1613: warning for unused variable in tiny buildv8.0.1613
Problem: Warning for unused variable in tiny build. (Tony Mechelynck) Solution: Move declaration to inner block.
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index af3c700db7..e0bc3de218 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4588,7 +4588,6 @@ mch_call_shell_fork(
char_u *tofree1 = NULL;
char_u *tofree2 = NULL;
int i;
- char_u *p;
int pty_master_fd = -1; /* for pty's */
# ifdef FEAT_GUI
int pty_slave_fd = -1;
@@ -5174,6 +5173,7 @@ mch_call_shell_fork(
else if (has_mbyte)
{
int l;
+ char_u *p;
len += buffer_off;
buffer[len] = NUL;
diff --git a/src/version.c b/src/version.c
index a5883446ca..b5c613712a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1613,
+/**/
1612,
/**/
1611,