Mercurial > vim

changeset 29100:c09c7ea83047 v8.2.5071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5071: with some Mac OS version clockid_t is redefined Commit: https://github.com/vim/vim/commit/f5465ff5c83f5a8a3e05bec64a0c013e5bdeb46e Author: ichizok <gclient.gaap@gmail.com> Date: Thu Jun 9 14:50:10 2022 +0100 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 https://github.com/vim/vim/issues/10549)
author Bram Moolenaar <Bram@vim.org>
date Thu, 09 Jun 2022 16:00:03 +0200
parents 79a2be1c0e97
children 66edb33d194b
files src/os_mac.h src/version.c
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 */
 /**/
+    5071,
+/**/
     5070,
 /**/
     5069,