diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-03 21:57:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-03 21:57:26 +0100 |
| commit | 15f74fab653a784548d5d966644926b47ba2cfa7 (patch) | |
| tree | 9b5f7c61dce3d1668d65ee5e93e39b7dd281f950 | |
| parent | 242c152c08edbfaf17e8ae0b5d82841beabfa21a (diff) | |
| download | vim-git-15f74fab653a784548d5d966644926b47ba2cfa7.tar.gz | |
patch 8.2.4681: build fails with a combination of featuresv8.2.4681
Problem: Build fails with a combination of features.
Solution: Remove #ifdef for alloc_clear_id(). (John Marriott)
| -rw-r--r-- | src/alloc.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4681, +/**/ 4680, /**/ 4679, |