summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-09 18:52:40 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-09 18:52:40 +0100
commit5f24542e5eda590acdbee89b120fa2e19ec7596e (patch)
tree4a19716237a78cc9972291544c16ad9ff3c2c4c2
parent71bcfdf30109c3d6e40d143adcaf33964b18a70b (diff)
downloadvim-git-5f24542e5eda590acdbee89b120fa2e19ec7596e.tar.gz
patch 7.4.1069v7.4.1069
Problem: Compiler warning for unused argument. Solution: Add UNUSED.
-rw-r--r--src/misc2.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 0aad42821..d8202f88a 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -842,7 +842,7 @@ alloc(size)
char_u *
alloc_id(size, id)
unsigned size;
- int id;
+ int id UNUSED;
{
#ifdef FEAT_EVAL
if (alloc_fail_id == id && alloc_does_fail())
@@ -1007,7 +1007,7 @@ theend:
lalloc_id(size, message, id)
long_u size;
int message;
- int id;
+ int id UNUSED;
{
#ifdef FEAT_EVAL
if (alloc_fail_id == id && alloc_does_fail())
diff --git a/src/version.c b/src/version.c
index 4bc3963c2..e2013d1aa 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 */
/**/
+ 1069,
+/**/
1068,
/**/
1067,