Mercurial > vim
changeset 31555:5aa54cbc6e20 v9.0.1110
patch 9.0.1110: build fails on Mac OS X 10.4/10.5
Commit: https://github.com/vim/vim/commit/254480736f7db3667c7b84873efb49c2cb1d385f
Author: Evan Miller <emmiller@gmail.com>
Date: Fri Dec 30 10:42:23 2022 +0000
patch 9.0.1110: build fails on Mac OS X 10.4/10.5
Problem: Build fails on Mac OS X 10.4/10.5 .
Solution: Check if the dispatch/dispatch.h header exists. (Evan Miller,
closes #11746)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 30 Dec 2022 11:45:05 +0100 |
| parents | aa16a5da257a |
| children | d01fe76a049b |
| files | src/auto/configure src/config.h.in src/configure.ac src/feature.h src/version.c |
| diffstat | 5 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -4816,6 +4816,19 @@ fi 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 +
--- a/src/config.h.in +++ b/src/config.h.in @@ -236,6 +236,7 @@ /* 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
--- a/src/configure.ac +++ b/src/configure.ac @@ -314,6 +314,8 @@ fi 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)
--- a/src/feature.h +++ b/src/feature.h @@ -272,7 +272,8 @@ */ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ - && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ + && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \ + && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \ || defined(MSWIN)) # define FEAT_RELTIME #endif