mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC buildfix

Browse Source
This commit is contained in:
twinaphex 2018-04-08 23:13:20 +02:00
parent bc70477005
commit 3a4d094277
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_mapper.c
View File

@ -83,7 +83,7 @@ void input_mapper_free(input_mapper_t *handle)
void input_mapper_poll(input_mapper_t *handle)
{
int i, j;
unsigned i, j;
input_bits_t current_input;
settings_t *settings = config_get_ptr();
unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));

3
input/input_remapping.c
View File

@ -80,6 +80,7 @@ bool input_remapping_load_file(void *data, const char *path)
for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
{
int btn_remap = -1;
int key_remap = -1;
fill_pathname_join_delim(btn_ident[j], s1,
key_strings[j], '_', sizeof(btn_ident[j]));
@ -94,8 +95,6 @@ bool input_remapping_load_file(void *data, const char *path)
settings->uints.input_remap_ids[i][j] = RARCH_UNMAPPED;
/* else do nothing, important */
int key_remap = -1;
if (config_get_int(conf, key_ident[j], &key_remap))
settings->uints.input_keymapper_ids[i][j] = key_remap;
else

3
menu/cbs/menu_cbs_left.c
View File

@ -127,9 +127,8 @@ static int action_left_input_desc(unsigned type, const char *label,
static int action_left_input_desc_kbd(unsigned type, const char *label,
bool wraparound)
{
char desc[PATH_MAX_LENGTH];
unsigned key_id, id, offset;
unsigned remap_id;
unsigned key_id, id, offset;
settings_t *settings = config_get_ptr();
if (!settings)

8
menu/cbs/menu_cbs_sublabel.c
View File

@ -413,9 +413,9 @@ static int action_bind_sublabel_subsystem_add(
const char *label, const char *path,
char *s, size_t len)
{
rarch_system_info_t *system = runloop_get_system_info();
const struct retro_subsystem_info* subsystem = NULL;
subsystem = system->subsystem.data + (type - MENU_SETTINGS_SUBSYSTEM_ADD);
rarch_system_info_t *system = runloop_get_system_info();
const struct retro_subsystem_info *subsystem = system ?
system->subsystem.data + (type - MENU_SETTINGS_SUBSYSTEM_ADD) : NULL;
if (subsystem && content_get_subsystem_rom_id() < subsystem->num_roms)
snprintf(s, len, " Current Content: %s",
@ -432,7 +432,6 @@ static int action_bind_sublabel_remap_kbd_sublabel(
const char *label, const char *path,
char *s, size_t len)
{
char desc[PATH_MAX_LENGTH];
unsigned offset;
settings_t *settings = config_get_ptr();
@ -458,7 +457,6 @@ static int action_bind_sublabel_remap_sublabel(
const char *label, const char *path,
char *s, size_t len)
{
char desc[PATH_MAX_LENGTH];
unsigned offset;
settings_t *settings = config_get_ptr();

4
runahead/dirty_input.c
View File

@ -56,7 +56,7 @@ static void input_state_set_last(unsigned port, unsigned device,
InputListElementConstructor, free);
/* find list item */
for (i = 0; i < input_state_list->size; i++)
for (i = 0; i < (unsigned)input_state_list->size; i++)
{
element = (InputListElement*)input_state_list->data[i];
if ( element->port == port
@ -84,7 +84,7 @@ static int16_t input_state_get_last(unsigned port,
return 0;
/* find list item */
for (i = 0; i < input_state_list->size; i++)
for (i = 0; i < (unsigned)input_state_list->size; i++)
{
InputListElement *element =
(InputListElement*)input_state_list->data[i];