Skip to content

Commit f5465ff

Browse files
ichizokbrammool
authored andcommitted
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)
1 parent b5f0801 commit f5465ff

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/os_mac.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,15 +272,14 @@
272272

273273
# include <dispatch/dispatch.h>
274274

275-
# if !defined(MAC_OS_X_VERSION_10_12) || \
276-
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12)
275+
# ifndef MAC_OS_X_VERSION_10_12
277276
typedef int clockid_t;
278277
# endif
279278
# ifndef CLOCK_REALTIME
280-
# define CLOCK_REALTIME 0
279+
# define CLOCK_REALTIME 0
281280
# endif
282281
# ifndef CLOCK_MONOTONIC
283-
# define CLOCK_MONOTONIC 1
282+
# define CLOCK_MONOTONIC 1
284283
# endif
285284

286285
struct itimerspec

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
5071,
737739
/**/
738740
5070,
739741
/**/

0 commit comments

Comments
 (0)