winemac: Don't define kVK_RightCommand when building against the macOS 10.12 SDK.
Ken Thomases
ken at codeweavers.com
Thu Jun 23 16:53:04 CDT 2016
Apple added the same enum declaration to their headers, causing a build failure.
Signed-off-by: Ken Thomases <ken at codeweavers.com>
---
For <https://bugs.winehq.org/show_bug.cgi?id=40830>.
dlls/winemac.drv/cocoa_window.m | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index d3b3c89..4f59121 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -43,10 +43,12 @@ - (void) toggleFullScreen:(id)sender;
#endif
+#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
/* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
enum {
kVK_RightCommand = 0x36, /* Invented for Wine; was unused */
};
+#endif
static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)
--
2.8.2
More information about the wine-patches
mailing list