From 063c562a3715e9fce21b791ad4c8980b09b64a89 Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Mon, 18 Sep 2023 20:04:32 +0200 Subject: patch 9.0.1910: Mac OS X: missing sound support on older versions Problem: Mac OS X: missing sound support on older versions Solution: Check Macro MAC_OS_X_VERSION_MIN_REQUIRED Extend guard for sound support on OS X Fixes build on legacy versions where required coreaudio functionality may not be available. NSSoundDelegate apparently was introduced in Snow Leopard yet the build breaks on it. Guarding off enabling sound support to El Capitan as that's the next version I had access to for testing (it may work on earlier versions) https://developer.apple.com/documentation/appkit/nssounddelegate Vim builds on OS X Tiger 10.4 and newer with this change. closes: #13115 Signed-off-by: Christian Brabandt Co-authored-by: Sevan Janiyan --- src/version.c | 2 ++ src/vim.h | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 7670cddde6..c2bef2ff57 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1910, /**/ 1909, /**/ diff --git a/src/vim.h b/src/vim.h index 6b05a2ae67..cd54d69ab6 100644 --- a/src/vim.h +++ b/src/vim.h @@ -102,6 +102,11 @@ # define ROOT_UID 0 #endif +/* Include MAC_OS_X_VERSION_* macros */ +#ifdef HAVE_AVAILABILITYMACROS_H +# include +#endif + /* * MACOS_X compiling for Mac OS X * MACOS_X_DARWIN integrating the darwin feature into MACOS_X @@ -167,7 +172,9 @@ # if defined(FEAT_NORMAL) && !defined(FEAT_CLIPBOARD) # define FEAT_CLIPBOARD # endif -# if defined(FEAT_HUGE) && !defined(FEAT_SOUND) +# if defined(FEAT_HUGE) && !defined(FEAT_SOUND) && \ + defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 # define FEAT_SOUND # endif # if defined(FEAT_SOUND) -- cgit v1.2.3