# HG changeset patch # User Christian Brabandt # Date 1696275904 -7200 # Node ID 21287c90cc2cdf0cd7f5d89cc9dcb6b5e6853d01 # Parent 1b698c7ef2b455b89ebc2e1cd583fe93d236ce81 patch 9.0.1971: macOS: FEAT_SOUND guard too restrictive Commit: https://github.com/vim/vim/commit/f59cbefd0aa1cda7d3fd5fbd02678e82ee155ad1 Author: Yee Cheng Chin Date: Mon Oct 2 21:28:50 2023 +0200 patch 9.0.1971: macOS: FEAT_SOUND guard too restrictive Problem: macOS: FEAT_SOUND guard too restrictive Solution: check for older macOS support properly Fix macOS FEAT_SOUND guards to be less restrictive This allows +sound to work on older macOS platforms again. The +sound implementation uses APIs available in 10.6, but the code itself uses generics with type parameters which was only added in Xcode 7 / clang 7, which was released for macOS 10.11. This means as long as Vim is compiled under 10.11+, and using a deployment target >= 10.6, the feature will work. closes: #13251 Signed-off-by: Christian Brabandt Co-authored-by: Yee Cheng Chin diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1971, +/**/ 1970, /**/ 1969, diff --git a/src/vim.h b/src/vim.h --- a/src/vim.h +++ b/src/vim.h @@ -173,8 +173,8 @@ # define FEAT_CLIPBOARD # endif # if defined(FEAT_HUGE) && !defined(FEAT_SOUND) && \ - defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \ - MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 + defined(__clang_major__) && __clang_major__ >= 7 && \ + defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 # define FEAT_SOUND # endif # if defined(FEAT_SOUND)