From 751f595bb674192f22d6d091bf68ad263b120c35 Mon Sep 17 00:00:00 2001
From: milek7 <me@milek7.pl>
Date: Sun, 14 Feb 2021 14:06:19 +0100
Subject: Fix: VkMapping declarations violated C++ ODR rule.

---
 src/video/cocoa/cocoa_keys.h | 4 ++--
 src/video/cocoa/cocoa_wnd.mm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/video/cocoa')

diff --git a/src/video/cocoa/cocoa_keys.h b/src/video/cocoa/cocoa_keys.h
index e09fe3c8a..dff4f881a 100644
--- a/src/video/cocoa/cocoa_keys.h
+++ b/src/video/cocoa/cocoa_keys.h
@@ -132,14 +132,14 @@
 #define QZ_IBOOK_UP     0x3E
 
 
-struct VkMapping {
+struct CocoaVkMapping {
 	unsigned short vk_from;
 	byte map_to;
 };
 
 #define AS(x, z) {x, z}
 
-static const VkMapping _vk_mapping[] = {
+static const CocoaVkMapping _vk_mapping[] = {
 	AS(QZ_BACKQUOTE,  WKC_BACKQUOTE), // key left of '1'
 	AS(QZ_BACKQUOTE2, WKC_BACKQUOTE), // some keyboards have it on another scancode
 
diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm
index 30fa3969b..78e942c92 100644
--- a/src/video/cocoa/cocoa_wnd.mm
+++ b/src/video/cocoa/cocoa_wnd.mm
@@ -673,7 +673,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 	BOOL interpret_keys = YES;
 	if (down) {
 		/* Map keycode to OTTD code. */
-		auto vk = std::find_if(std::begin(_vk_mapping), std::end(_vk_mapping), [=](const VkMapping &m) { return m.vk_from == keycode; });
+		auto vk = std::find_if(std::begin(_vk_mapping), std::end(_vk_mapping), [=](const CocoaVkMapping &m) { return m.vk_from == keycode; });
 		uint32 pressed_key = vk != std::end(_vk_mapping) ? vk->map_to : 0;
 
 		if (modifiers & NSShiftKeyMask)     pressed_key |= WKC_SHIFT;
-- 
cgit v1.2.3-54-g00ecf