From 2440b6198dfce70f956d870574ea9d6e2b94a50d Mon Sep 17 00:00:00 2001 From: misson20000 Date: Mon, 22 Jan 2018 20:35:48 -0800 Subject: [PATCH] buildfix for netplay identifiers that weren't in #ifdef HAVE_NETPLAY blocks --- config.def.h | 2 ++ menu/cbs/menu_cbs_get_value.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/config.def.h b/config.def.h index f2686f5463..1d2cc4f085 100644 --- a/config.def.h +++ b/config.def.h @@ -548,9 +548,11 @@ static const int netplay_check_frames = 600; static const bool netplay_use_mitm_server = false; +#ifdef HAVE_NETWORKING static const unsigned netplay_share_digital = RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE; static const unsigned netplay_share_analog = RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE; +#endif /* On save state load, block SRAM from being overwritten. * This could potentially lead to buggy games. */ diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index a5dba20d1e..60c1c0de3a 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -1718,6 +1718,7 @@ static void menu_action_setting_disp_set_label_setting_path(file_list_t* list, strlcpy(s2, path, len2); } +#ifdef HAVE_NETWORKING static void menu_action_setting_disp_set_label_netplay_share_digital(file_list_t* list, unsigned *w, unsigned type, unsigned i, const char *label, @@ -1795,6 +1796,7 @@ static void menu_action_setting_disp_set_label_netplay_share_analog(file_list_t* } strlcpy(s, src, len); } +#endif // HAVE_NETWORKING static int menu_cbs_init_bind_get_string_representation_compare_label( menu_file_list_cbs_t *cbs) @@ -1899,6 +1901,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_menu_input_keyboard_gamepad_mapping_type); break; +#ifdef HAVE_NETWORKING case MENU_ENUM_LABEL_NETPLAY_SHARE_DIGITAL: BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_netplay_share_digital); @@ -1907,6 +1910,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_netplay_share_analog); break; +#endif // HAVE_NETWORKING case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST: case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: