Skip to content

Commit f59cbef

Browse files
ychinchrisbra
authored andcommitted
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 <[email protected]> Co-authored-by: Yee Cheng Chin <[email protected]>
1 parent 7086b3e commit f59cbef

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1971,
707709
/**/
708710
1970,
709711
/**/

src/vim.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
# define FEAT_CLIPBOARD
174174
# endif
175175
# if defined(FEAT_HUGE) && !defined(FEAT_SOUND) && \
176-
defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
177-
MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
176+
defined(__clang_major__) && __clang_major__ >= 7 && \
177+
defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
178178
# define FEAT_SOUND
179179
# endif
180180
# if defined(FEAT_SOUND)

0 commit comments

Comments
 (0)