1
0
forked from aniani/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)
This commit is contained in:
Evan Miller
2022-12-30 10:42:23 +00:00
committed by Bram Moolenaar
parent c4b3f6477c
commit 254480736f
5 changed files with 20 additions and 1 deletions

13
src/auto/configure vendored
View File

@@ -4816,6 +4816,19 @@ fi
done 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

View File

@@ -236,6 +236,7 @@
/* Define if you have the header file: */ /* Define if you have the header file: */
#undef HAVE_DIRENT_H #undef HAVE_DIRENT_H
#undef HAVE_DISPATCH_DISPATCH_H
#undef HAVE_ERRNO_H #undef HAVE_ERRNO_H
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
#undef HAVE_FRAME_H #undef HAVE_FRAME_H

View File

@@ -314,6 +314,8 @@ fi
dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon 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. dnl so we need to include it to have access to version macros.
AC_CHECK_HEADERS(AvailabilityMacros.h) 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_SRC)
AC_SUBST(OS_EXTRA_OBJ) AC_SUBST(OS_EXTRA_OBJ)

View File

@@ -272,7 +272,8 @@
*/ */
#if defined(FEAT_NORMAL) \ #if defined(FEAT_NORMAL) \
&& defined(FEAT_EVAL) \ && 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)) || defined(MSWIN))
# define FEAT_RELTIME # define FEAT_RELTIME
#endif #endif

View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1110,
/**/ /**/
1109, 1109,
/**/ /**/