From 751f595bb674192f22d6d091bf68ad263b120c35 Mon Sep 17 00:00:00 2001 From: milek7 Date: Sun, 14 Feb 2021 14:06:19 +0100 Subject: Fix: VkMapping declarations violated C++ ODR rule. --- src/video/cocoa/cocoa_keys.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video/cocoa/cocoa_keys.h') 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 -- cgit v1.2.3-70-g09d2