summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/window.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/window.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/sdl/window.cpp')
-rw-r--r--src/osd/sdl/window.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 683f3369f68..47ab3cdd162 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -146,7 +146,7 @@ static void sdlwindow_sync(void);
//============================================================
-INLINE void execute_async(osd_work_callback callback, const worker_param &wp)
+static inline void execute_async(osd_work_callback callback, const worker_param &wp)
{
worker_param *wp_temp = (worker_param *) osd_malloc(sizeof(worker_param));
*wp_temp = wp;
@@ -158,7 +158,7 @@ INLINE void execute_async(osd_work_callback callback, const worker_param &wp)
callback((void *) wp_temp, 0);
}
-INLINE void execute_sync(osd_work_callback callback, const worker_param &wp)
+static inline void execute_sync(osd_work_callback callback, const worker_param &wp)
{
worker_param *wp_temp = (worker_param *) osd_malloc(sizeof(worker_param));
*wp_temp = wp;
@@ -171,7 +171,7 @@ INLINE void execute_sync(osd_work_callback callback, const worker_param &wp)
// execute_async_wait
//============================================================
-INLINE void execute_async_wait(osd_work_callback callback, const worker_param &wp)
+static inline void execute_async_wait(osd_work_callback callback, const worker_param &wp)
{
execute_async(callback, wp);
sdlwindow_sync();
@@ -380,7 +380,7 @@ void sdl_osd_interface::window_exit()
// sdlwindow_blit_surface_size
//============================================================
-INLINE int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
+static inline int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
{
float aspect0 = (float)width0 / (float)height0;
float aspect1 = (float)width1 / (float)height1;