Commit: patch 9.0.1910: Mac OS X: missing sound support on older versions

3 views
Skip to first unread message

Christian Brabandt

unread,
Sep 18, 2023, 2:15:11 PM9/18/23
to vim...@googlegroups.com
patch 9.0.1910: Mac OS X: missing sound support on older versions

Commit: https://github.com/vim/vim/commit/063c562a3715e9fce21b791ad4c8980b09b64a89
Author: Sevan Janiyan <vent...@geeklan.co.uk>
Date: Mon Sep 18 20:04:32 2023 +0200

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 <c...@256bit.org>
Co-authored-by: Sevan Janiyan <vent...@geeklan.co.uk>

diff --git a/src/version.c b/src/version.c
index 7670cddde..c2bef2ff5 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 6b05a2ae6..cd54d69ab 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 <AvailabilityMacros.h>
+#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)
Reply all
Reply to author
Forward
0 new messages