mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some CXX_BUILD fixes

Browse Source
This commit is contained in:
twinaphex 2016-02-25 22:11:02 +01:00
parent eb9971703b
commit 68cd176d63
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/cbs/menu_cbs_deferred_push.c
View File

@ -45,9 +45,9 @@ enum
PUSH_DETECT_CORE_LIST PUSH_DETECT_CORE_LIST
}; };
static int deferred_push_dlist(menu_displaylist_info_t *info, unsigned val) static int deferred_push_dlist(menu_displaylist_info_t *info, enum menu_displaylist_ctl_state state)
{ {
if (!menu_displaylist_ctl(val, info)) if (!menu_displaylist_ctl(state, info))
return menu_cbs_exit(); return menu_cbs_exit();
menu_displaylist_ctl(DISPLAYLIST_PROCESS, info); menu_displaylist_ctl(DISPLAYLIST_PROCESS, info);
return 0; return 0;
@ -319,10 +319,8 @@ static int deferred_archive_action(menu_displaylist_info_t *info)
return deferred_push_dlist(info, DISPLAYLIST_ARCHIVE_ACTION); return deferred_push_dlist(info, DISPLAYLIST_ARCHIVE_ACTION);
} }
static int general_push(menu_displaylist_info_t *info, static int general_push(menu_displaylist_info_t *info,
unsigned id, unsigned type) unsigned id, enum menu_displaylist_ctl_state state)
{ {
struct retro_system_info *system_menu = NULL; struct retro_system_info *system_menu = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -426,7 +424,7 @@ static int general_push(menu_displaylist_info_t *info,
#endif #endif
} }
return deferred_push_dlist(info, type); return deferred_push_dlist(info, state);
} }
static int deferred_push_detect_core_list(menu_displaylist_info_t *info) static int deferred_push_detect_core_list(menu_displaylist_info_t *info)

2
menu/drivers/zr.c
View File

@ -749,7 +749,7 @@ static struct zr_user_font font_bake_and_upload(
/* upload baked font image */ /* upload baked font image */
struct texture_image ti; struct texture_image ti;
ti.pixels = img; ti.pixels = (uint32_t*)img;
ti.width = (GLsizei)img_width; ti.width = (GLsizei)img_width;
ti.height = (GLsizei)img_height; ti.height = (GLsizei)img_height;