From e1db3e7a6d0fbcab2e0c0233c1712d917c52dc89 Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 3 Jan 2018 03:22:25 -0800 Subject: [PATCH] C89_BUILD: Fix some clang compiler errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes these two compile errors with C89_BUILD=1 configuration.c:2028:9: error: ISO C90 forbids mixing declarations and code [-Werror,-Wdeclaration-after-statement] bool has_application_data = ^ 1 error generated. make: *** [Makefile:164: obj-unix/configuration.o] Error 1 In file included from menu/widgets/menu_osk.c:42: menu/widgets/menu_osk_utf8_pages.h:62:94: error: no newline at end of file [-Werror,-Wnewline-eof] "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"}; ^ 1 error generated. make: *** [Makefile:163: obj-unix/menu/widgets/menu_osk.o] Error 1 --- configuration.c | 3 ++- menu/widgets/menu_osk_utf8_pages.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configuration.c b/configuration.c index e1ccd1ba5b..4b32773063 100644 --- a/configuration.c +++ b/configuration.c @@ -1932,6 +1932,7 @@ static void config_set_defaults(void) **/ static config_file_t *open_default_config_file(void) { + bool has_application_data; size_t path_size = PATH_MAX_LENGTH * sizeof(char); char *application_data = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *conf_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); @@ -2025,7 +2026,7 @@ static config_file_t *open_default_config_file(void) RARCH_WARN("Created new config file in: \"%s\".\n", conf_path); } #elif !defined(RARCH_CONSOLE) - bool has_application_data = + has_application_data = fill_pathname_application_data(application_data, path_size); diff --git a/menu/widgets/menu_osk_utf8_pages.h b/menu/widgets/menu_osk_utf8_pages.h index bcd7481918..d8dae11f04 100644 --- a/menu/widgets/menu_osk_utf8_pages.h +++ b/menu/widgets/menu_osk_utf8_pages.h @@ -59,4 +59,4 @@ static const char *katakana_page2_grid[] = { "ナ","ニ","ヌ","ネ","ノ","バ","ビ","ブ","ベ","ボ","⇦", "ハ","ヒ","フ","ヘ","ホ","パ","ピ","プ","ペ","ポ","⏎", "マ","ミ","ム","メ","モ","ン","ッ","ャ","ュ","ョ","⇧", - "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"}; \ No newline at end of file + "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"};