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/sdl_v.cpp | |
parent | 5a1fa185094dbcb563ba2b4ed5530995be374b19 (diff) | |
download | openttd-751f595bb674192f22d6d091bf68ad263b120c35.tar.xz |
Fix: VkMapping declarations violated C++ ODR rule.
Diffstat (limited to 'src/video/sdl_v.cpp')
-rw-r--r-- | src/video/sdl_v.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index 56068fe44..f67d46801 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -403,7 +403,7 @@ bool VideoDriver_SDL::ClaimMousePointer() return true; } -struct VkMapping { +struct SDLVkMapping { #if SDL_VERSION_ATLEAST(1, 3, 0) SDL_Keycode vk_from; #else @@ -416,7 +416,7 @@ struct VkMapping { #define AS(x, z) {x, 0, z} #define AM(x, y, z, w) {x, (byte)(y - x), z} -static const VkMapping _vk_mapping[] = { +static const SDLVkMapping _vk_mapping[] = { /* Pageup stuff + up/down */ AM(SDLK_PAGEUP, SDLK_PAGEDOWN, WKC_PAGEUP, WKC_PAGEDOWN), AS(SDLK_UP, WKC_UP), @@ -470,7 +470,7 @@ static const VkMapping _vk_mapping[] = { static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, WChar *character) { - const VkMapping *map; + const SDLVkMapping *map; uint key = 0; for (map = _vk_mapping; map != endof(_vk_mapping); ++map) { |