summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-19 17:22:49 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-19 17:22:49 +0100
commit1f68d992cd2fd7f484fbdc14eb8a9feefe59bec8 (patch)
tree9f16fc6b39e21a4d60579808e1c1c7ec07ee478c
parentc829faa8211df52997c0b9ee49cdea0c8786b177 (diff)
patch 8.2.5133: MacOS: build failsv8.2.5133
Problem: MacOS: build fails. Solution: Remove "#if 0" from timer_delete().
-rw-r--r--src/os_macosx.m2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/os_macosx.m b/src/os_macosx.m
index 1fdfbc70dd..acc5b0794d 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -370,7 +370,6 @@ timer_settime(
* Disabled because it is not currently used, but an implemented provided
* for completeness and possible future use.
*/
-#if 0
int
timer_delete(timer_t timerid)
{
@@ -380,7 +379,6 @@ timer_delete(timer_t timerid)
return 0;
}
-#endif
#endif /* FEAT_RELTIME */
diff --git a/src/version.c b/src/version.c
index c045d17fb6..f27217e147 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5133,
+/**/
5132,
/**/
5131,