mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 02:00:41 +00:00
Fix some CXX_BUILD errors
This commit is contained in:
parent
0f8cf1a579
commit
d412c9f8d4
@ -34,8 +34,8 @@ int action_cancel_pop_default(const char *path,
|
||||
const char *label, unsigned type, size_t idx)
|
||||
{
|
||||
size_t new_selection_ptr;
|
||||
const char *menu_label = NULL;
|
||||
enum msg_hash_enums enum_idx = 0;
|
||||
const char *menu_label = NULL;
|
||||
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
|
||||
|
||||
(void)path;
|
||||
(void)label;
|
||||
|
@ -122,7 +122,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
|
||||
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
|
||||
|
||||
if (!menu)
|
||||
return false;
|
||||
return NULL;
|
||||
|
||||
if (!menu_display_init_first_driver(video_is_threaded))
|
||||
goto error;
|
||||
|
@ -34,7 +34,7 @@ enum OZONE_TEXTURE {
|
||||
OZONE_TEXTURE_LAST
|
||||
};
|
||||
|
||||
static char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
|
||||
static const char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
|
||||
"retroarch",
|
||||
"cursor_border"
|
||||
};
|
||||
@ -51,7 +51,7 @@ enum OZONE_THEME_TEXTURES {
|
||||
OZONE_THEME_TEXTURE_LAST
|
||||
};
|
||||
|
||||
static char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
|
||||
static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
|
||||
"button_a",
|
||||
"button_b",
|
||||
"switch",
|
||||
@ -74,7 +74,7 @@ enum OZONE_TAB_TEXTURES {
|
||||
OZONE_TAB_TEXTURE_LAST
|
||||
};
|
||||
|
||||
static char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = {
|
||||
static const char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = {
|
||||
"retroarch",
|
||||
"settings",
|
||||
"history",
|
||||
|
@ -8445,7 +8445,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
|
||||
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
|
||||
{
|
||||
unsigned i, size = 0;
|
||||
struct video_display_config *list = video_display_server_get_resolution_list(&size);
|
||||
struct video_display_config *list = (struct video_display_config*)
|
||||
video_display_server_get_resolution_list(&size);
|
||||
|
||||
if (list)
|
||||
{
|
||||
|
@ -405,12 +405,14 @@ bool recording_init(void)
|
||||
if (streaming_is_enabled())
|
||||
{
|
||||
params.config = settings->paths.path_stream_config;
|
||||
params.preset = settings->uints.video_stream_quality;
|
||||
params.preset = (enum record_config_type)
|
||||
settings->uints.video_stream_quality;
|
||||
}
|
||||
else
|
||||
{
|
||||
params.config = settings->paths.path_record_config;
|
||||
params.preset = settings->uints.video_record_quality;
|
||||
params.preset = (enum record_config_type)
|
||||
settings->uints.video_record_quality;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -48,7 +48,7 @@ static void InputListElementRealloc(InputListElement *element, unsigned int newS
|
||||
{
|
||||
if (newSize > element->state_size)
|
||||
{
|
||||
element->state = realloc(element->state, newSize * sizeof(int16_t));
|
||||
element->state = (int16_t*)realloc(element->state, newSize * sizeof(int16_t));
|
||||
memset(&element->state[element->state_size], 0, (newSize - element->state_size) * sizeof(int16_t));
|
||||
element->state_size = newSize;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user