From fe36eb6bdd26b776ae88cb27ff3388b7b0543a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Thu, 19 Nov 2015 09:55:38 -0300 Subject: [PATCH 1/3] (zarch) Fix CXX_BUILD GCC warnings --- menu/drivers/zarch.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 0977720db3..716395d797 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -480,7 +480,7 @@ static bool zarch_zui_list_item(zui_t *zui, zui_tabbed_t *tab, int x1, int y1, tab->prev_id = tab->active_id; } - if (zui->pending_selection == -1) + if (zui->pending_selection == ~0U) { if (item_id < zui->active_id) zui->prev_id = item_id; @@ -548,7 +548,7 @@ static bool zarch_zui_tab(zui_t *zui, zui_tabbed_t *tab, const char *label, unsi tab->prev_id = tab->active_id; - if (zui->item.active == id || tab->active_id == ~0 || !tab->inited) + if (zui->item.active == id || tab->active_id == ~0U || !tab->inited) tab->active_id = id; else if (id > tab->active_id) { @@ -578,7 +578,7 @@ static bool zarch_zui_tab(zui_t *zui, zui_tabbed_t *tab, const char *label, unsi static void zarch_zui_render_lay_settings(zui_t *zui) { int width, x1, y1; - static zui_tabbed_t tabbed = {~0}; + static zui_tabbed_t tabbed = {~0U}; tabbed.vertical = true; tabbed.tab_width = 100; @@ -605,7 +605,7 @@ static int zarch_zui_render_lay_root_recent(zui_t *zui, zui_tabbed_t *tabbed) if (zui->recent_dlist_first < 0) zui->recent_dlist_first = 0; - else if (zui->recent_dlist_first > size - 5) + else if (zui->recent_dlist_first > (int)size - 5) zui->recent_dlist_first = size - 5; zui->recent_dlist_first = min(max(zui->recent_dlist_first, 0), size - 5); @@ -706,7 +706,7 @@ static int zarch_zui_render_lay_root_load(zui_t *zui, zui_tabbed_t *tabbed) if (zui->load_dlist_first < 0) zui->load_dlist_first = 0; - else if (zui->load_dlist_first > size - 5) + else if (zui->load_dlist_first > (int)size - 5) zui->load_dlist_first = size - 5; zui->load_dlist_first = min(max(zui->load_dlist_first, 0), size - 5 - skip); @@ -784,7 +784,7 @@ static int zarch_zui_render_lay_root_downloads(zui_t *zui, zui_tabbed_t *tabbed) static int zarch_zui_render_lay_root(zui_t *zui) { char item[PATH_MAX_LENGTH]; - static zui_tabbed_t tabbed = {~0}; + static zui_tabbed_t tabbed = {~0U}; zarch_zui_tabbed_begin(zui, &tabbed, 0, 0); @@ -810,19 +810,19 @@ static int zarch_zui_render_lay_root(zui_t *zui) zarch_zui_draw_text(zui, ZUI_FG_NORMAL, 1600 +12, 300 + 111, item); #endif - if (zui->pending_selection == -1) + if (zui->pending_selection == ~0U) { switch (zui->action) { case MENU_ACTION_UP: - if (zui->prev_id != -1 && zui->prev_id != zui->active_id) + if (zui->prev_id != ~0U && zui->prev_id != zui->active_id) { if (zui->prev_id < zui->active_id) zui->pending_selection = zui->prev_id; } break; case MENU_ACTION_DOWN: - if (zui->next_id != -1 && zui->next_id != zui->active_id) + if (zui->next_id != ~0U && zui->next_id != zui->active_id) { if (zui->next_id > zui->active_id) zui->pending_selection = zui->next_id; @@ -843,7 +843,7 @@ static int zarch_zui_render_lay_root(zui_t *zui) static int zarch_zui_render_sidebar(zui_t *zui) { int width, x1, y1; - static zui_tabbed_t tabbed = {~0}; + static zui_tabbed_t tabbed = {~0U}; tabbed.vertical = true; tabbed.tab_width = 100; @@ -907,7 +907,7 @@ static void zarch_render(void) static int zarch_zui_render_pick_core(zui_t *zui) { - static zui_tabbed_t tabbed = {~0}; + static zui_tabbed_t tabbed = {~0U}; unsigned i, j = 0; if (zui->pick_supported == 1) { From ad745a5661f0030955d373cb7448c58b519aea92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Thu, 19 Nov 2015 10:04:18 -0300 Subject: [PATCH 2/3] (egl_common) Fix clang warnings --- gfx/common/egl_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c index 1e121b72e7..67a4bf57a1 100644 --- a/gfx/common/egl_common.c +++ b/gfx/common/egl_common.c @@ -55,7 +55,7 @@ gfx_ctx_proc_t egl_get_proc_address(const char *symbol) retro_assert(sizeof(void*) == sizeof(void (*)(void))); - sym__ = eglGetProcAddress(symbol); + sym__ = (void*)eglGetProcAddress(symbol); memcpy(&ret, &sym__, sizeof(void*)); return ret; From 27f77a4291fad358c4a88ce27fffb0c36a85e1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Thu, 19 Nov 2015 10:05:08 -0300 Subject: [PATCH 3/3] (cheevos) Fix clang warning --- cheevos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheevos.c b/cheevos.c index df8d5c6bda..266622996d 100644 --- a/cheevos.c +++ b/cheevos.c @@ -849,7 +849,7 @@ static int cheevos_parse(const char *json) ud.core_count = 0; ud.unofficial_count = 0; - if (!jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK) + if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK) { cheevos_unload(); return -1;