From dd40c46d50f9f22643b828e80783d3576b9c1d50 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Mon, 15 Oct 2018 23:04:04 -0400 Subject: Fix menu warnings change offending bool return to int warning: cast between incompatible function types from '_Bool (*)(void)' to 'int (*)(void)' [-Wcast-function-type] forgot to remove -- typedef int (*menu_function)(void); Change-Id: Ie4c8d3ddb0fb7843c4ec584203350d658d6bee3e --- apps/enc_config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/enc_config.c') diff --git a/apps/enc_config.c b/apps/enc_config.c index 07405cdac1..7741c293f0 100644 --- a/apps/enc_config.c +++ b/apps/enc_config.c @@ -440,7 +440,7 @@ void enc_global_settings_apply(void) /* Show an encoder's config menu based on the global_settings. Modified settings are placed in global_settings.enc_config. */ -bool enc_global_config_menu(void) +int enc_global_config_menu(void) { struct encoder_config cfg; @@ -453,12 +453,12 @@ bool enc_global_config_menu(void) { menu_callback_data.cfg = &cfg; menu_callback_data.global = true; - return do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false) - == MENU_ATTACHED_USB; + int retmenu = do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false); + return (retmenu == MENU_ATTACHED_USB) ? 1 : 0; } else { splash(HZ, ID2P(LANG_NO_SETTINGS)); - return false; + return 0; } } /* enc_global_config_menu */ -- cgit v1.2.3