From 1b34dd4ce0e1307bd362d14c728ae49096dd20d2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 25 Jun 2015 17:36:31 +0200 Subject: [PATCH] Some more CXX_BUILD fixes --- input/connect/connect_wii.c | 2 +- menu/cbs/menu_cbs_iterate.c | 3 ++- menu/drivers/rgui.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c index 0d952a9921..bda914399a 100644 --- a/input/connect/connect_wii.c +++ b/input/connect/connect_wii.c @@ -542,7 +542,7 @@ static int wiimote_handshake(struct wiimote_t* wm, continue; case 4: { - int id; + uint32_t id; int32_t *ptr = (int32_t*)data; if (event != WM_RPT_READ) diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c index 8f7d89cf75..4f6ab3d00a 100644 --- a/menu/cbs/menu_cbs_iterate.c +++ b/menu/cbs/menu_cbs_iterate.c @@ -495,7 +495,8 @@ static int action_iterate_main(const char *label, unsigned action) static bool did_messagebox = false; char msg[PATH_MAX_LENGTH] = {0}; enum action_iterate_type iterate_type; - size_t selected, *pop_selected = false; + size_t selected; + size_t *pop_selected = NULL; bool do_messagebox = false; bool do_pop_stack = false; bool do_post_iterate = false; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 9d43bc5f8e..4e22431346 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -650,7 +650,7 @@ static void rgui_free(void *data) if (disp->font.alloc_framebuf) free((uint8_t*)disp->font.framebuf); - disp->font.alloc_framebuf = NULL; + disp->font.alloc_framebuf = false; } static void rgui_set_texture(void)