From 0edce1a2a463db87afe3486a21c63e12d5631771 Mon Sep 17 00:00:00 2001 From: Patrick Zacharias Date: Sat, 6 Jun 2020 16:02:58 +0200 Subject: [PATCH] gui: Repair OEM build Building with TW_OEM_BUILD results in errors during compilation: error: unused label 'error' [-Werror,-Wunused-label] error: unused parameter 'allow_commands' [-Werror,-Wunused-parameter] These changes are required to allow compilation to complete. Change-Id: Iddc5bf1b90120de19a472c48b21d3531b758cacf (cherry picked from commit 0cd6be903b3129b30d5abe40d3a0f30545eef27d) --- gui/gui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/gui.cpp b/gui/gui.cpp index bab7ed21..c91dd43c 100755 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -858,10 +858,12 @@ extern "C" int gui_loadCustomResources(void) #endif return 0; +#ifndef TW_OEM_BUILD error: LOGERR("An internal error has occurred: unable to load theme.\n"); gGuiInitialized = 0; return -1; +#endif } extern "C" int gui_start(void) @@ -869,7 +871,7 @@ extern "C" int gui_start(void) return gui_startPage("main", 1, 0); } -extern "C" int gui_startPage(const char *page_name, const int allow_commands, int stop_on_page_done) +extern "C" int gui_startPage(const char *page_name, __attribute__((unused)) const int allow_commands, int stop_on_page_done) { if (!gGuiInitialized) return -1;