summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/input.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/osd/sdl/input.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/sdl/input.cpp')
-rw-r--r--src/osd/sdl/input.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/sdl/input.cpp b/src/osd/sdl/input.cpp
index 1bfde78ee8b..e2732c0a61c 100644
--- a/src/osd/sdl/input.cpp
+++ b/src/osd/sdl/input.cpp
@@ -1525,7 +1525,7 @@ INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax)
//============================================================
#if (SDLMAME_SDL2)
-INLINE sdl_window_info * window_from_id(Uint32 windowID)
+static inline sdl_window_info * window_from_id(Uint32 windowID)
{
sdl_window_info *w;
SDL_Window *window = SDL_GetWindowFromID(windowID);
@@ -1541,7 +1541,7 @@ INLINE sdl_window_info * window_from_id(Uint32 windowID)
return NULL;
}
-INLINE void resize_all_windows(void)
+static inline void resize_all_windows(void)
{
sdl_window_info *w;
osd_ticks_t now = osd_ticks();