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/allegro_v.cpp | |
| parent | 5a1fa185094dbcb563ba2b4ed5530995be374b19 (diff) | |
| download | openttd-751f595bb674192f22d6d091bf68ad263b120c35.tar.xz | |
Fix: VkMapping declarations violated C++ ODR rule.
Diffstat (limited to 'src/video/allegro_v.cpp')
| -rw-r--r-- | src/video/allegro_v.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index c3df6c650..b62486a98 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -235,7 +235,7 @@ bool VideoDriver_Allegro::ClaimMousePointer() return true; } -struct VkMapping { +struct AllegroVkMapping { uint16 vk_from; byte vk_count; byte map_to; @@ -244,7 +244,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 AllegroVkMapping _vk_mapping[] = { /* Pageup stuff + up/down */ AM(KEY_PGUP, KEY_PGDN, WKC_PAGEUP, WKC_PAGEDOWN), AS(KEY_UP, WKC_UP), @@ -302,7 +302,7 @@ static uint32 ConvertAllegroKeyIntoMy(WChar *character) int scancode; int unicode = ureadkey(&scancode); - const VkMapping *map; + const AllegroVkMapping *map; uint key = 0; for (map = _vk_mapping; map != endof(_vk_mapping); ++map) { |