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/sdl2_v.cpp | |
| parent | 5a1fa185094dbcb563ba2b4ed5530995be374b19 (diff) | |
| download | openttd-751f595bb674192f22d6d091bf68ad263b120c35.tar.xz | |
Fix: VkMapping declarations violated C++ ODR rule.
Diffstat (limited to 'src/video/sdl2_v.cpp')
| -rw-r--r-- | src/video/sdl2_v.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index 6beeeac5c..14a8bfd1c 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -401,7 +401,7 @@ void VideoDriver_SDL::EditBoxLostFocus() } -struct VkMapping { +struct SDLVkMapping { SDL_Keycode vk_from; byte vk_count; byte map_to; @@ -413,7 +413,7 @@ struct VkMapping { #define AS_UP(x, z) {x, 0, z, true} #define AM_UP(x, y, z, w) {x, (byte)(y - x), z, true} -static const VkMapping _vk_mapping[] = { +static const SDLVkMapping _vk_mapping[] = { /* Pageup stuff + up/down */ AS_UP(SDLK_PAGEUP, WKC_PAGEUP), AS_UP(SDLK_PAGEDOWN, WKC_PAGEDOWN), @@ -468,7 +468,7 @@ static const VkMapping _vk_mapping[] = { static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, WChar *character) { - const VkMapping *map; + const SDLVkMapping *map; uint key = 0; bool unprintable = false; @@ -508,7 +508,7 @@ static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, WChar *character) */ static uint ConvertSdlKeycodeIntoMy(SDL_Keycode kc) { - const VkMapping *map; + const SDLVkMapping *map; uint key = 0; for (map = _vk_mapping; map != endof(_vk_mapping); ++map) { |