ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More CXX_BUILD fixes

This commit is contained in:
twinaphex 2015-09-06 04:22:30 +02:00
parent 0ba87ae378
commit 33240511da
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_animation.c
View File

@ -696,12 +696,12 @@ float menu_animation_get_delta_time(struct menu_animation_t *animation)
return anim->delta_time; 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)); struct menu_animation *anim = (struct menu_animation*)calloc(1, sizeof(*anim));
if (!anim) if (!anim)
return NULL; return NULL;
return anim; return (struct menu_animation_t*)anim;
} }
bool menu_animation_is_active(struct menu_animation_t *animation) bool menu_animation_is_active(struct menu_animation_t *animation)

2
menu/menu_animation.h
View File

@ -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); 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 #ifdef __cplusplus
} }

2
menu/menu_display.h
View File

@ -43,7 +43,7 @@ typedef struct menu_display
bool msg_force; bool msg_force;
menu_framebuf_t frame_buf; menu_framebuf_t frame_buf;
void *animation; struct menu_animation_t *animation;
struct struct
{ {