mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should fix Emscripten build

Browse Source
This commit is contained in:
twinaphex 2018-02-04 19:57:31 +01:00
parent df1c131520
commit 3aaab43736
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
menu/cbs/menu_cbs_get_value.c
View File

@ -309,6 +309,7 @@ static void menu_action_setting_disp_set_label_pipeline(
} }
#ifdef HAVE_NETWORKING
static void menu_action_setting_disp_set_label_netplay_mitm_server( static void menu_action_setting_disp_set_label_netplay_mitm_server(
file_list_t* list, file_list_t* list,
unsigned *w, unsigned type, unsigned i, unsigned *w, unsigned type, unsigned i,
@ -318,6 +319,7 @@ static void menu_action_setting_disp_set_label_netplay_mitm_server(
const char *path, const char *path,
char *s2, size_t len2) char *s2, size_t len2)
{ {
unsigned i;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
*s = '\0'; *s = '\0';
@ -327,17 +329,17 @@ static void menu_action_setting_disp_set_label_netplay_mitm_server(
if (!settings) if (!settings)
return; return;
if (!string_is_empty(settings->arrays.netplay_mitm_server)) if (string_is_empty(settings->arrays.netplay_mitm_server))
{ return;
unsigned i;
for (i = 0; i < ARRAY_SIZE(netplay_mitm_server_list); i++) for (i = 0; i < ARRAY_SIZE(netplay_mitm_server_list); i++)
{ {
if (string_is_equal(settings->arrays.netplay_mitm_server, netplay_mitm_server_list[i].name)) if (string_is_equal(settings->arrays.netplay_mitm_server,
strlcpy(s, netplay_mitm_server_list[i].description, len); netplay_mitm_server_list[i].name))
} strlcpy(s, netplay_mitm_server_list[i].description, len);
} }
} }
#endif
static void menu_action_setting_disp_set_label_shader_watch_for_changes( static void menu_action_setting_disp_set_label_shader_watch_for_changes(
file_list_t* list, file_list_t* list,
@ -2230,8 +2232,10 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
menu_action_setting_disp_set_label_achievement_information); menu_action_setting_disp_set_label_achievement_information);
return 0; return 0;
case MENU_ENUM_LABEL_NETPLAY_MITM_SERVER: case MENU_ENUM_LABEL_NETPLAY_MITM_SERVER:
#ifdef HAVE_NETWORKING
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_netplay_mitm_server); menu_action_setting_disp_set_label_netplay_mitm_server);
#endif
return 0; return 0;
default: default:
break; break;

2
menu/drivers/zarch.c
View File

@ -729,7 +729,9 @@ static int zarch_zui_render_lay_root_downloads(
static int zarch_zui_render_lay_root(video_frame_info_t *video_info, static int zarch_zui_render_lay_root(video_frame_info_t *video_info,
zui_t *zui) zui_t *zui)
{ {
#ifdef ZARCH_DEBUG
char item[PATH_MAX_LENGTH]; char item[PATH_MAX_LENGTH];
#endif
static struct zui_tabbed tabbed = {~0U}; static struct zui_tabbed tabbed = {~0U};
zarch_zui_tabbed_begin(zui, &tabbed, 0, 0); zarch_zui_tabbed_begin(zui, &tabbed, 0, 0);

2
menu/menu_setting.c
View File

@ -575,11 +575,13 @@ static void setting_get_string_representation_uint_autosave_interval(void *data,
} }
#endif #endif
#if defined(HAVE_NETWORKING)
static void setting_get_string_representation_netplay_mitm_server(void *data, static void setting_get_string_representation_netplay_mitm_server(void *data,
char *s, size_t len) char *s, size_t len)
{ {
} }
#endif
#ifdef HAVE_LANGEXTRA #ifdef HAVE_LANGEXTRA
static void setting_get_string_representation_uint_user_language(void *data, static void setting_get_string_representation_uint_user_language(void *data,