diff options
| author | Evan Miller <emmiller@gmail.com> | 2022-12-30 10:42:23 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-30 10:42:23 +0000 |
| commit | 254480736f7db3667c7b84873efb49c2cb1d385f (patch) | |
| tree | bb553eea78434d15a688dd3c6321b81f13e9f4a2 | |
| parent | c4b3f6477c4956c49da1277d55e6915ea7e6a39e (diff) | |
patch 9.0.1110: build fails on Mac OS X 10.4/10.5v9.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)
| -rwxr-xr-x | src/auto/configure | 13 | ||||
| -rw-r--r-- | src/config.h.in | 1 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/feature.h | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 20 insertions, 1 deletions
diff --git a/src/auto/configure b/src/auto/configure index 92826d4d6d..44d83c29fd 100755 --- 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 + diff --git a/src/config.h.in b/src/config.h.in index b77418c1cc..6cb43da125 100644 --- 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 diff --git a/src/configure.ac b/src/configure.ac index a5beb834dc..fc346dc811 100644 --- 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) diff --git a/src/feature.h b/src/feature.h index 948539b1b3..3255f8abd3 100644 --- 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 diff --git a/src/version.c b/src/version.c index 773a919789..3d2b85175b 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1110, +/**/ 1109, /**/ 1108, |