To: vim_dev@googlegroups.com Subject: Patch 9.0.1110 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1110 Problem: Build fails on Mac OS X 10.4/10.5 . Solution: Check if the dispatch/dispatch.h header exists. (Evan Miller, closes #11746) Files: src/config.h.in, src/configure.ac, src/auto/configure, src/feature.h *** ../vim-9.0.1109/src/config.h.in 2022-11-02 13:30:37.530314524 +0000 --- src/config.h.in 2022-12-30 10:38:30.653676325 +0000 *************** *** 236,241 **** --- 236,242 ---- /* Define if you have the header file: */ #undef HAVE_DIRENT_H + #undef HAVE_DISPATCH_DISPATCH_H #undef HAVE_ERRNO_H #undef HAVE_FCNTL_H #undef HAVE_FRAME_H *** ../vim-9.0.1109/src/configure.ac 2022-11-23 12:06:05.661733908 +0000 --- src/configure.ac 2022-12-30 10:38:30.653676325 +0000 *************** *** 314,319 **** --- 314,321 ---- dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon dnl so we need to include it to have access to version macros. AC_CHECK_HEADERS(AvailabilityMacros.h) + # 10.5 and earlier lack dispatch + AC_CHECK_HEADERS(dispatch/dispatch.h) AC_SUBST(OS_EXTRA_SRC) AC_SUBST(OS_EXTRA_OBJ) *** ../vim-9.0.1109/src/auto/configure 2022-11-23 12:06:05.661733908 +0000 --- src/auto/configure 2022-12-30 10:40:35.669921039 +0000 *************** *** 4816,4821 **** --- 4816,4834 ---- done + # 10.5 and earlier lack dispatch + for ac_header in dispatch/dispatch.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default" + if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DISPATCH_DISPATCH_H 1 + _ACEOF + + fi + + done + *** ../vim-9.0.1109/src/feature.h 2022-10-13 22:12:07.164673822 +0100 --- src/feature.h 2022-12-30 10:38:30.653676325 +0000 *************** *** 272,278 **** */ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ ! && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ || defined(MSWIN)) # define FEAT_RELTIME #endif --- 272,279 ---- */ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ ! && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \ ! && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \ || defined(MSWIN)) # define FEAT_RELTIME #endif *** ../vim-9.0.1109/src/version.c 2022-12-30 10:36:30.029867662 +0000 --- src/version.c 2022-12-30 10:40:25.137894774 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1110, /**/ -- Q: Why does /dev/null accept only integers? A: You can't sink a float. /// 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 ///