(MSVC) Build fixes

This commit is contained in:
twinaphex 2015-04-20 20:00:39 +02:00
parent f3875924e5
commit 9ef656dc61
7 changed files with 10 additions and 11 deletions

View File

@ -59,9 +59,9 @@ static bool win32_browser(
LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
{
WPARAM mode = wparam & 0xffff;
unsigned cmd = EVENT_CMD_NONE;
bool do_wm_close = false;
WPARAM mode = wparam & 0xffff;
enum event_command cmd = EVENT_CMD_NONE;
bool do_wm_close = false;
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();

View File

@ -982,9 +982,8 @@ static int action_ok_custom_viewport(const char *path,
}
static int generic_action_ok_command(unsigned cmd)
static int generic_action_ok_command(enum event_command cmd)
{
if (!event_command(cmd))
return -1;
return 0;

View File

@ -54,7 +54,7 @@ static bool check_pause(bool pause_pressed, bool frameadvance_pressed)
runloop_t *runloop = rarch_main_get_ptr();
static bool old_focus = true;
bool focus = true;
unsigned cmd = EVENT_CMD_NONE;
enum event_command cmd = EVENT_CMD_NONE;
bool old_is_paused = runloop->is_paused;
settings_t *settings = config_get_ptr();

View File

@ -2937,7 +2937,7 @@ static void general_read_handler(void *data)
static void general_write_handler(void *data)
{
unsigned rarch_cmd = EVENT_CMD_NONE;
enum event_command rarch_cmd = EVENT_CMD_NONE;
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();

View File

@ -114,7 +114,7 @@ void settings_list_current_add_values(
void settings_list_current_add_cmd(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
unsigned values)
enum event_command values)
{
unsigned idx = list_info->index - 1;
(*list)[idx].cmd_trigger.idx = values;

View File

@ -173,7 +173,7 @@ typedef struct rarch_setting
struct
{
unsigned idx;
enum event_command idx;
bool triggered;
} cmd_trigger;
@ -219,7 +219,7 @@ void settings_list_current_add_values(
void settings_list_current_add_cmd(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
unsigned values);
enum event_command values);
void settings_info_list_free(rarch_setting_info_t *list_info);

View File

@ -63,7 +63,7 @@ static void ui_companion_null_toggle(void *data)
(void)data;
}
static void ui_companion_null_event_command(void *data, unsigned cmd)
static void ui_companion_null_event_command(void *data, enum event_command cmd)
{
(void)data;
(void)cmd;