From b4ff34dae51a45744432ce74955b8981fb463257 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 23 Nov 2014 12:48:05 +0200
Subject: [PATCH] Use recently added OS version detection to check for HID
 Manager API availability

---
 src/cocoa/i_joystick.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/cocoa/i_joystick.cpp b/src/cocoa/i_joystick.cpp
index bd2c59348d..56db8f815d 100644
--- a/src/cocoa/i_joystick.cpp
+++ b/src/cocoa/i_joystick.cpp
@@ -37,13 +37,12 @@
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
 
-#include <CoreServices/CoreServices.h>
-
 #include "HID_Utilities_External.h"
 
 #include "d_event.h"
 #include "doomdef.h"
 #include "templates.h"
+#include "i_osversion.h"
 
 
 namespace
@@ -730,16 +729,9 @@ IOKitJoystickManager* s_joystickManager;
 
 void I_StartupJoysticks()
 {
-	SInt32 majorVersion = 0;
-	SInt32 minorVersion = 0;
+	// HID Manager API is available on 10.5 (Darwin 9.x) or newer
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-	Gestalt(gestaltSystemVersionMajor, &majorVersion);
-	Gestalt(gestaltSystemVersionMinor, &minorVersion);
-#pragma clang diagnostic pop
-
-	if (majorVersion >= 10 && minorVersion >= 5)
+	if (darwinVersion.major >= 9)
 	{
 		s_joystickManager = new IOKitJoystickManager;
 	}