dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: VkMapping declarations violated C++ ODR rule.

Browse Source
This commit is contained in:
milek7
2021-02-14 14:06:19 +01:00
committed by Loïc Guilloux
parent 5a1fa18509
commit 751f595bb6
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/sdl_v.cpp
View File

@@ -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) {