From 33240511da3029c0fde1f60767ba8ee86f192447 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Sep 2015 04:22:30 +0200 Subject: [PATCH] More CXX_BUILD fixes --- menu/menu_animation.c | 4 ++-- menu/menu_animation.h | 2 +- menu/menu_display.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/menu/menu_animation.c b/menu/menu_animation.c index e491c66c27..361470ef5b 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -696,12 +696,12 @@ float menu_animation_get_delta_time(struct menu_animation_t *animation) return anim->delta_time; } -void *menu_animation_init(void) +struct menu_animation_t *menu_animation_init(void) { struct menu_animation *anim = (struct menu_animation*)calloc(1, sizeof(*anim)); if (!anim) return NULL; - return anim; + return (struct menu_animation_t*)anim; } bool menu_animation_is_active(struct menu_animation_t *animation) diff --git a/menu/menu_animation.h b/menu/menu_animation.h index 6b3a6de69d..2045787cff 100644 --- a/menu/menu_animation.h +++ b/menu/menu_animation.h @@ -129,7 +129,7 @@ float menu_animation_get_delta_time(struct menu_animation_t *anim); bool menu_animation_is_active(struct menu_animation_t *anim); -void *menu_animation_init(void); +struct menu_animation_t *menu_animation_init(void); #ifdef __cplusplus } diff --git a/menu/menu_display.h b/menu/menu_display.h index 87e4758b79..507e1e5e7b 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -43,7 +43,7 @@ typedef struct menu_display bool msg_force; menu_framebuf_t frame_buf; - void *animation; + struct menu_animation_t *animation; struct {