From: Evan Miller <emmiller@gmail.com>
Date: Fri, 30 Dec 2022 10:42:23 +0000 (+0000)
Subject: patch 9.0.1110: build fails on Mac OS X 10.4/10.5
X-Git-Tag: v9.0.1110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=254480736f7db3667c7b84873efb49c2cb1d385f;p=vim

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)
---

diff --git a/src/auto/configure b/src/auto/configure
index 92826d4d6..44d83c29f 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 b77418c1c..6cb43da12 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 a5beb834d..fc346dc81 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 948539b1b..3255f8abd 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 773a91978..3d2b85175 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1110,
 /**/
     1109,
 /**/