From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 24 May 2017 13:16:32 +0000 (+0200)
Subject: Compatibility with macOS 10.12 SDK
X-Git-Tag: v1.8.90~147
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b0a0ef0e6140a6c6a4c89813c98e3821df58f2b;p=tigervnc.git

Compatibility with macOS 10.12 SDK

They finally added kVK_RightCommand, so our workaround needs to be
conditional.
---

diff --git a/vncviewer/cocoa.mm b/vncviewer/cocoa.mm
index 85b736ba..6e464fa4 100644
--- a/vncviewer/cocoa.mm
+++ b/vncviewer/cocoa.mm
@@ -37,8 +37,11 @@
 
 #define NoSymbol 0
 
-// These are undocumented for unknown reasons
+// This wasn't added until 10.12
+#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
 const int kVK_RightCommand = 0x36;
+#endif
+// And this is still missing
 const int kVK_Menu = 0x6E;
 
 static bool captured = false;