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 e6e2633d21a13a98ae75408db8e4def38c445c07..9547d67192886d393740d12d9416ec740b65f4f4 100644 (file)
--- 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 4e3773b488667a32075ed002bc5567cab409fd95..79a3bad67db75489d1da0f94de3bd813bdea2904 100644 (file)
--- 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,
 /**/