From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 18 Jul 2016 19:56:03 +0000 (-0400)
Subject: stop using Gestalt() on OS X (deprecated and no longer operating correctly)
X-Git-Tag: 5.0-pre1~36
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=bb29478aa2739f985cc7d41ae48340a85f0b89cb;p=ardour.git

stop using Gestalt() on OS X (deprecated and no longer operating correctly)

The incorrect behaviour was documented and did not cause issues in Ardour, but we should
still stop using this ancient call.
---

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index cdfd4e036d..974247aef5 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -116,7 +116,7 @@
 #include "audiographer/routines.h"
 
 #if defined (__APPLE__)
-       #include <Carbon/Carbon.h> // For Gestalt
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include "pbd/i18n.h"
@@ -206,12 +206,8 @@ setup_hardware_optimization (bool try_optimization)
 		}
 
 #elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
-		SInt32 sysVersion = 0;
 
-		if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
-			sysVersion = 0;
-
-		if (sysVersion >= 0x00001040) { // Tiger at least
+		if (floor (kCFCoreFoundationVersionNumber) > kCFCoreFoundationVersionNumber10_4) { /* at least Tiger */
 			compute_peak           = veclib_compute_peak;
 			find_peaks             = veclib_find_peaks;
 			apply_gain_to_buffer   = veclib_apply_gain_to_buffer;