diff options
author | Yee Cheng Chin <ychin.git@gmail.com> | 2023-10-02 21:28:50 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2023-10-02 21:28:50 +0200 |
commit | f59cbefd0aa1cda7d3fd5fbd02678e82ee155ad1 (patch) | |
tree | 31a194140eec00e2907c04f2fd9721466fef29a6 /src | |
parent | 7086b3e76a81cf87592077d54e0ef46a60006c2c (diff) |
patch 9.0.1971: macOS: FEAT_SOUND guard too restrictivev9.0.1971
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 <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index de1fe3f3cc..d4cf8cc3b8 100644 --- 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, @@ -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) |