Module: wine Branch: master Commit: cac226200d88b7454747b5ee1016f06b89ce4aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac226200d88b7454747b5ee10...
Author: Ken Thomases ken@codeweavers.com Date: Thu Jun 23 16:53:04 2016 -0500
winemac: Don't define kVK_RightCommand when building against the macOS 10.12 SDK.
Apple added the same enum declaration to their headers, causing a build failure.
Signed-off-by: Ken Thomases ken@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 @@ enum { #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)