# HG changeset patch # User Bram Moolenaar # Date 1649019604 -7200 # Node ID ff649d0078d649968b0f602119453487e97778ea # Parent c0bd4e26210ea168f32bd60487a57cc16e474c0d patch 8.2.4681: build fails with a combination of features Commit: https://github.com/vim/vim/commit/15f74fab653a784548d5d966644926b47ba2cfa7 Author: Bram Moolenaar Date: Sun Apr 3 21:57:26 2022 +0100 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 --- 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 i #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 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4681, +/**/ 4680, /**/ 4679,