summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/input.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/osd/sdl/input.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
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();