commit f5465ff5c83f5a8a3e05bec64a0c013e5bdeb46e
author ichizok <gclient.gaap@gmail.com> Thu Jun 09 14:50:10 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Jun 09 14:50:10 2022 +0100
tree 65d83f9354bf2f7110f8d35b44d493e8c8a3aa76
parent b5f0801b1f043b5cf99380f58eca51b75b3236c7

patch 8.2.5071: with some Mac OS version clockid_t is redefined

Problem:    With some Mac OS version clockid_t is redefined.
Solution:   Adjust #ifdefs. (Ozaki Kiichi, closes #10549)

src/os_mac.h

diff --git a/src/os_mac.h b/src/os_mac.h
index 646dff4..a7b1dba 100644
--- a/src/os_mac.h
+++ b/src/os_mac.h
@@ -272,15 +272,14 @@
 
 # include <dispatch/dispatch.h>
 
-# if !defined(MAC_OS_X_VERSION_10_12) || \
-	(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12)
+# ifndef MAC_OS_X_VERSION_10_12
 typedef int clockid_t;
 # endif
 # ifndef CLOCK_REALTIME
-#   define CLOCK_REALTIME 0
+#  define CLOCK_REALTIME 0
 # endif
 # ifndef CLOCK_MONOTONIC
-#   define CLOCK_MONOTONIC 1
+#  define CLOCK_MONOTONIC 1
 # endif
 
 struct itimerspec

src/version.c

diff --git a/src/version.c b/src/version.c
index 5163254..ebfd0d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5071,
+/**/
     5070,
 /**/
     5069,