To: vim_dev@googlegroups.com Subject: Patch 8.2.5071 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5071 Problem: With some Mac OS version clockid_t is redefined. Solution: Adjust #ifdefs. (Ozaki Kiichi, closes #10549) Files: src/os_mac.h *** ../vim-8.2.5070/src/os_mac.h 2022-06-05 22:05:15.600289401 +0100 --- src/os_mac.h 2022-06-09 14:45:43.565895557 +0100 *************** *** 272,286 **** # include ! # if !defined(MAC_OS_X_VERSION_10_12) || \ ! (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12) typedef int clockid_t; # endif # ifndef CLOCK_REALTIME ! # define CLOCK_REALTIME 0 # endif # ifndef CLOCK_MONOTONIC ! # define CLOCK_MONOTONIC 1 # endif struct itimerspec --- 272,285 ---- # include ! # ifndef MAC_OS_X_VERSION_10_12 typedef int clockid_t; # endif # ifndef CLOCK_REALTIME ! # define CLOCK_REALTIME 0 # endif # ifndef CLOCK_MONOTONIC ! # define CLOCK_MONOTONIC 1 # endif struct itimerspec *** ../vim-8.2.5070/src/version.c 2022-06-09 13:55:23.171025955 +0100 --- src/version.c 2022-06-09 14:48:30.433822615 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5071, /**/ -- I just planted an Algebra tree. It has square roots. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///