• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision5aa54cbc6e200fea21ce25a6ca33056ef08d2ec3 (tree)
Time2022-12-30 19:45:05
AuthorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

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)

Change Summary

Incremental Difference

diff -r aa16a5da257a -r 5aa54cbc6e20 src/auto/configure
--- a/src/auto/configure Fri Dec 30 11:45:05 2022 +0100
+++ b/src/auto/configure Fri Dec 30 11:45:05 2022 +0100
@@ -4816,6 +4816,19 @@
48164816
48174817 done
48184818
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+
48194832
48204833
48214834
diff -r aa16a5da257a -r 5aa54cbc6e20 src/config.h.in
--- a/src/config.h.in Fri Dec 30 11:45:05 2022 +0100
+++ b/src/config.h.in Fri Dec 30 11:45:05 2022 +0100
@@ -236,6 +236,7 @@
236236
237237 /* Define if you have the header file: */
238238 #undef HAVE_DIRENT_H
239+#undef HAVE_DISPATCH_DISPATCH_H
239240 #undef HAVE_ERRNO_H
240241 #undef HAVE_FCNTL_H
241242 #undef HAVE_FRAME_H
diff -r aa16a5da257a -r 5aa54cbc6e20 src/configure.ac
--- a/src/configure.ac Fri Dec 30 11:45:05 2022 +0100
+++ b/src/configure.ac Fri Dec 30 11:45:05 2022 +0100
@@ -314,6 +314,8 @@
314314 dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon
315315 dnl so we need to include it to have access to version macros.
316316 AC_CHECK_HEADERS(AvailabilityMacros.h)
317+# 10.5 and earlier lack dispatch
318+AC_CHECK_HEADERS(dispatch/dispatch.h)
317319
318320 AC_SUBST(OS_EXTRA_SRC)
319321 AC_SUBST(OS_EXTRA_OBJ)
diff -r aa16a5da257a -r 5aa54cbc6e20 src/feature.h
--- a/src/feature.h Fri Dec 30 11:45:05 2022 +0100
+++ b/src/feature.h Fri Dec 30 11:45:05 2022 +0100
@@ -272,7 +272,8 @@
272272 */
273273 #if defined(FEAT_NORMAL) \
274274 && 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))) \
276277 || defined(MSWIN))
277278 # define FEAT_RELTIME
278279 #endif
diff -r aa16a5da257a -r 5aa54cbc6e20 src/version.c
--- a/src/version.c Fri Dec 30 11:45:05 2022 +0100
+++ b/src/version.c Fri Dec 30 11:45:05 2022 +0100
@@ -696,6 +696,8 @@
696696 static int included_patches[] =
697697 { /* Add new patch number below this line */
698698 /**/
699+ 1110,
700+/**/
699701 1109,
700702 /**/
701703 1108,
Show on old repository browser