Mirror of the Vim source from https://github.com/vim/vim
Revision | 5aa54cbc6e200fea21ce25a6ca33056ef08d2ec3 (tree) |
---|---|
Time | 2022-12-30 19:45:05 |
Author | Bram Moolenaar <Bram@vim....> |
Commiter | Bram Moolenaar |
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
@@ -4816,6 +4816,19 @@ | ||
4816 | 4816 | |
4817 | 4817 | done |
4818 | 4818 | |
4819 | +# 10.5 and earlier lack dispatch | |
4820 | +for ac_header in dispatch/dispatch.h | |
4821 | +do : | |
4822 | + ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default" | |
4823 | +if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then : | |
4824 | + cat >>confdefs.h <<_ACEOF | |
4825 | +#define HAVE_DISPATCH_DISPATCH_H 1 | |
4826 | +_ACEOF | |
4827 | + | |
4828 | +fi | |
4829 | + | |
4830 | +done | |
4831 | + | |
4819 | 4832 | |
4820 | 4833 | |
4821 | 4834 |
@@ -236,6 +236,7 @@ | ||
236 | 236 | |
237 | 237 | /* Define if you have the header file: */ |
238 | 238 | #undef HAVE_DIRENT_H |
239 | +#undef HAVE_DISPATCH_DISPATCH_H | |
239 | 240 | #undef HAVE_ERRNO_H |
240 | 241 | #undef HAVE_FCNTL_H |
241 | 242 | #undef HAVE_FRAME_H |
@@ -314,6 +314,8 @@ | ||
314 | 314 | dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon |
315 | 315 | dnl so we need to include it to have access to version macros. |
316 | 316 | AC_CHECK_HEADERS(AvailabilityMacros.h) |
317 | +# 10.5 and earlier lack dispatch | |
318 | +AC_CHECK_HEADERS(dispatch/dispatch.h) | |
317 | 319 | |
318 | 320 | AC_SUBST(OS_EXTRA_SRC) |
319 | 321 | AC_SUBST(OS_EXTRA_OBJ) |
@@ -272,7 +272,8 @@ | ||
272 | 272 | */ |
273 | 273 | #if defined(FEAT_NORMAL) \ |
274 | 274 | && defined(FEAT_EVAL) \ |
275 | - && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ | |
275 | + && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \ | |
276 | + && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \ | |
276 | 277 | || defined(MSWIN)) |
277 | 278 | # define FEAT_RELTIME |
278 | 279 | #endif |
@@ -696,6 +696,8 @@ | ||
696 | 696 | static int included_patches[] = |
697 | 697 | { /* Add new patch number below this line */ |
698 | 698 | /**/ |
699 | + 1110, | |
700 | +/**/ | |
699 | 701 | 1109, |
700 | 702 | /**/ |
701 | 703 | 1108, |