diff options
| author | milek7 <me@milek7.pl> | 2021-02-14 14:06:19 +0100 |
|---|---|---|
| committer | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-02-14 23:19:50 +0100 |
| commit | 751f595bb674192f22d6d091bf68ad263b120c35 (patch) | |
| tree | 9cc8de8864bc2e909a127834bf8fc8af5cde9c7c /src/video/win32_v.cpp | |
| parent | 5a1fa185094dbcb563ba2b4ed5530995be374b19 (diff) | |
| download | openttd-751f595bb674192f22d6d091bf68ad263b120c35.tar.xz | |
Fix: VkMapping declarations violated C++ ODR rule.
Diffstat (limited to 'src/video/win32_v.cpp')
| -rw-r--r-- | src/video/win32_v.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |