Mercurial > vim
comparison src/os_mac.h @ 29100:c09c7ea83047 v8.2.5071
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 | 9781c150eddd |
children | 1b2d6aa29267 |
comparison
equal
deleted
inserted
replaced
29099:79a2be1c0e97 | 29100:c09c7ea83047 |
---|---|
270 | 270 |
271 #ifdef FEAT_RELTIME | 271 #ifdef FEAT_RELTIME |
272 | 272 |
273 # include <dispatch/dispatch.h> | 273 # include <dispatch/dispatch.h> |
274 | 274 |
275 # if !defined(MAC_OS_X_VERSION_10_12) || \ | 275 # ifndef MAC_OS_X_VERSION_10_12 |
276 (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12) | |
277 typedef int clockid_t; | 276 typedef int clockid_t; |
278 # endif | 277 # endif |
279 # ifndef CLOCK_REALTIME | 278 # ifndef CLOCK_REALTIME |
280 # define CLOCK_REALTIME 0 | 279 # define CLOCK_REALTIME 0 |
281 # endif | 280 # endif |
282 # ifndef CLOCK_MONOTONIC | 281 # ifndef CLOCK_MONOTONIC |
283 # define CLOCK_MONOTONIC 1 | 282 # define CLOCK_MONOTONIC 1 |
284 # endif | 283 # endif |
285 | 284 |
286 struct itimerspec | 285 struct itimerspec |
287 { | 286 { |
288 struct timespec it_interval; // timer period | 287 struct timespec it_interval; // timer period |