From 5d52f4856acd3c8c89bb1ca7ee5236ddd7c7af9a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 30 Nov 2015 05:13:12 +0100 Subject: [PATCH] Get rid of INLINE qualifier for some functions --- frontend/drivers/platform_linux.c | 2 +- menu/cbs/menu_cbs_title.c | 4 ++-- menu/drivers/rgui.c | 2 +- menu/menu_entries.c | 3 +-- ui/drivers/ui_win32.c | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 22ba4475ec..604feaa073 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -63,7 +63,7 @@ static int g_cpuCount; #endif #ifdef __i386__ -static INLINE void cpu_x86_cpuid(int func, int values[4]) +static void cpu_x86_cpuid(int func, int values[4]) { int a, b, c, d; /* We need to preserve ebx since we're compiling PIC code */ diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 9dd44cd5ea..c12d315db5 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -31,14 +31,14 @@ cbs->action_get_title_ident = #name; #endif -static INLINE void replace_chars(char *str, char c1, char c2) +static void replace_chars(char *str, char c1, char c2) { char *pos = NULL; while((pos = strchr(str, c1))) *pos = c2; } -static INLINE void sanitize_to_string(char *s, const char *label, size_t len) +static void sanitize_to_string(char *s, const char *label, size_t len) { char new_label[PATH_MAX_LENGTH] = {0}; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 9e73a984e4..73c45c1cf1 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -61,7 +61,7 @@ typedef struct unsigned last_height; } rgui_t; -static INLINE uint16_t argb32_to_rgba4444(uint32_t col) +static uint16_t argb32_to_rgba4444(uint32_t col) { unsigned a = ((col >> 24) & 0xff) >> 4; unsigned r = ((col >> 16) & 0xff) >> 4; diff --git a/menu/menu_entries.c b/menu/menu_entries.c index b86b7cdaec..95224b5d86 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -154,8 +154,7 @@ menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( file_list_get_actiondata_at_offset(list, idx); } -static INLINE int menu_entries_flush_stack_type( - const char *needle, const char *label, +static int menu_entries_flush_stack_type(const char *needle, const char *label, unsigned type, unsigned final_type) { return needle ? strcmp(needle, label) : (type != final_type); diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index 6ffbd30505..49cdbab7f9 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -115,7 +115,7 @@ typedef struct static shader_dlg_t g_shader_dlg = {0}; -static INLINE void shader_dlg_refresh_trackbar_label(int index) +static void shader_dlg_refresh_trackbar_label(int index) { char val_buffer[32] = {0}; struct video_shader* shader = video_shader_driver_get_current_shader();