From: ichizok <gclient.gaap@gmail.com>
Date: Thu, 9 Jun 2022 13:50:10 +0000 (+0100)
Subject: patch 8.2.5071: with some Mac OS version clockid_t is redefined
X-Git-Tag: v8.2.5071
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f5465ff5c83f5a8a3e05bec64a0c013e5bdeb46e;p=thirdparty%2Fvim.git

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)
---

diff --git a/src/os_mac.h b/src/os_mac.h
index 646dff414c..a7b1dba06a 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
diff --git a/src/version.c b/src/version.c
index 5163254aed..ebfd0d45fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5071,
 /**/
     5070,
 /**/