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/win32_v.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/video/win32_v.cpp') diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 68e6572ba..8ccdd803e 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -114,7 +114,7 @@ bool VideoDriver_Win32::ClaimMousePointer() return true; } -struct VkMapping { +struct Win32VkMapping { byte vk_from; byte vk_count; byte map_to; @@ -123,7 +123,7 @@ struct VkMapping { #define AS(x, z) {x, 0, z} #define AM(x, y, z, w) {x, y - x, z} -static const VkMapping _vk_mapping[] = { +static const Win32VkMapping _vk_mapping[] = { /* Pageup stuff + up/down */ AM(VK_PRIOR, VK_DOWN, WKC_PAGEUP, WKC_DOWN), /* Map letters & digits */ @@ -166,7 +166,7 @@ static const VkMapping _vk_mapping[] = { static uint MapWindowsKey(uint sym) { - const VkMapping *map; + const Win32VkMapping *map; uint key = 0; for (map = _vk_mapping; map != endof(_vk_mapping); ++map) { -- cgit v1.2.3-54-g00ecf