mirror of
https://github.com/libretro/RetroArch
synced 2025-03-29 22:20:21 +00:00
Some CXX_BUILD fixes
This commit is contained in:
parent
6991b43e81
commit
0ba87ae378
@ -36,7 +36,7 @@ struct tween
|
||||
tween_cb cb;
|
||||
};
|
||||
|
||||
typedef struct menu_animation
|
||||
struct menu_animation
|
||||
{
|
||||
struct tween *list;
|
||||
|
||||
@ -49,7 +49,7 @@ typedef struct menu_animation
|
||||
float delta_time;
|
||||
retro_time_t cur_time;
|
||||
retro_time_t old_time;
|
||||
} menu_animation_t;
|
||||
};
|
||||
|
||||
struct menu_animation_t *menu_animation_get_ptr(void)
|
||||
{
|
||||
|
@ -43,7 +43,7 @@ typedef struct menu_display
|
||||
bool msg_force;
|
||||
|
||||
menu_framebuf_t frame_buf;
|
||||
struct menu_animation_t *animation;
|
||||
void *animation;
|
||||
|
||||
struct
|
||||
{
|
||||
|
@ -1492,7 +1492,7 @@ static int deferred_push_video_shader_parameters_common(
|
||||
}
|
||||
#endif
|
||||
|
||||
static void menu_displaylist_realloc_settings(struct menu_entries_t *entries, unsigned flags)
|
||||
static void menu_displaylist_realloc_settings(void *entries, unsigned flags)
|
||||
{
|
||||
menu_entries_free_list(entries);
|
||||
menu_entries_new_list(entries, flags);
|
||||
|
@ -101,7 +101,7 @@ typedef struct
|
||||
menu_display_t display;
|
||||
|
||||
/* Menu entries */
|
||||
struct menu_entries_t *entries;
|
||||
void *entries;
|
||||
|
||||
bool load_no_content;
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
#include "../general.h"
|
||||
|
||||
typedef struct menu_entries
|
||||
struct menu_entries
|
||||
{
|
||||
/* Flagged when menu entries need to be refreshed */
|
||||
bool need_refresh;
|
||||
@ -28,7 +28,7 @@ typedef struct menu_entries
|
||||
menu_list_t *menu_list;
|
||||
rarch_setting_t *list_settings;
|
||||
menu_navigation_t navigation;
|
||||
} menu_entries_t;
|
||||
};
|
||||
|
||||
static struct menu_entries *menu_entries_get_ptr(void)
|
||||
{
|
||||
@ -240,7 +240,7 @@ bool menu_entries_init(void *data)
|
||||
if (!entries)
|
||||
goto error;
|
||||
|
||||
menu->entries = (void*)entries;
|
||||
menu->entries = (struct menu_entries*)entries;
|
||||
|
||||
if (!(entries->menu_list = (menu_list_t*)menu_list_new()))
|
||||
goto error;
|
||||
@ -269,14 +269,14 @@ void menu_entries_free(void)
|
||||
entries->menu_list = NULL;
|
||||
}
|
||||
|
||||
void menu_entries_free_list(struct menu_entries_t *data)
|
||||
void menu_entries_free_list(void *data)
|
||||
{
|
||||
struct menu_entries *entries = (struct menu_entries*)data;
|
||||
if (entries && entries->list_settings)
|
||||
menu_setting_free(entries->list_settings);
|
||||
}
|
||||
|
||||
void menu_entries_new_list(struct menu_entries_t *data, unsigned flags)
|
||||
void menu_entries_new_list(void *data, unsigned flags)
|
||||
{
|
||||
struct menu_entries *entries = (struct menu_entries*)data;
|
||||
if (!entries)
|
||||
|
@ -60,9 +60,9 @@ bool menu_entries_init(void *data);
|
||||
|
||||
void menu_entries_free(void);
|
||||
|
||||
void menu_entries_free_list(struct menu_entries_t *data);
|
||||
void menu_entries_free_list(void *data);
|
||||
|
||||
void menu_entries_new_list(struct menu_entries_t *data, unsigned flags);
|
||||
void menu_entries_new_list(void *data, unsigned flags);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user