From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 3 Apr 2022 20:57:26 +0000 (+0100)
Subject: patch 8.2.4681: build fails with a combination of features
X-Git-Tag: v8.2.4681
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15f74fab653a784548d5d966644926b47ba2cfa7;p=vim

patch 8.2.4681: build fails with a combination of features

Problem:    Build fails with a combination of features.
Solution:   Remove #ifdef for alloc_clear_id(). (John Marriott)
---

diff --git a/src/alloc.c b/src/alloc.c
index e6e2633d2..9547d6719 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -180,7 +180,6 @@ alloc_clear(size_t size)
     return p;
 }
 
-#if defined(FEAT_SIGNS) || defined(PROTO)
 /*
  * Same as alloc_clear() but with allocation id for testing
  */
@@ -193,7 +192,6 @@ alloc_clear_id(size_t size, alloc_id_T id UNUSED)
 #endif
     return alloc_clear(size);
 }
-#endif
 
 /*
  * Allocate memory like lalloc() and set all bytes to zero.
diff --git a/src/version.c b/src/version.c
index 4e3773b48..79a3bad67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4681,
 /**/
     4680,
 /**/