changeset 33426:21287c90cc2c v9.0.1971

patch 9.0.1971: macOS: FEAT_SOUND guard too restrictive Commit: https://github.com/vim/vim/commit/f59cbefd0aa1cda7d3fd5fbd02678e82ee155ad1 Author: Yee Cheng Chin <ychin.git@gmail.com> 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 <cb@256bit.org> Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author Christian Brabandt <cb@256bit.org>
date Mon, 02 Oct 2023 21:45:04 +0200
parents 1b698c7ef2b4
children fcf35032170a
files src/version.c src/vim.h
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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)