aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.5071: with some Mac OS version clockid_t is redefined

Browse Source 
Problem:    With some Mac OS version clockid_t is redefined.
Solution:   Adjust #ifdefs. (Ozaki Kiichi, closes #10549)
This commit is contained in:
ichizok 2022-06-09 14:50:10 +01:00 committed by Bram Moolenaar
parent b5f0801b1f
commit f5465ff5c8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/os_mac.h
View File

@ -272,15 +272,14 @@
# include <dispatch/dispatch.h> # include <dispatch/dispatch.h>
# if !defined(MAC_OS_X_VERSION_10_12) || \ # ifndef MAC_OS_X_VERSION_10_12
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12)
typedef int clockid_t; typedef int clockid_t;
# endif # endif
# ifndef CLOCK_REALTIME # ifndef CLOCK_REALTIME
# define CLOCK_REALTIME 0 # define CLOCK_REALTIME 0
# endif # endif
# ifndef CLOCK_MONOTONIC # ifndef CLOCK_MONOTONIC
# define CLOCK_MONOTONIC 1 # define CLOCK_MONOTONIC 1
# endif # endif
struct itimerspec struct itimerspec

2
src/version.c
View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5071,
/**/ /**/
5070, 5070,
/**/ /**/