Fix C89_BUILD

This commit is contained in:
twinaphex 2017-06-10 12:52:45 +02:00
parent 9b13894438
commit 95e588ce0f
4 changed files with 9 additions and 6 deletions

View File

@ -903,6 +903,7 @@ static void gfx_ctx_x_input_driver(void *data,
const char *joypad_name,
const input_driver_t **input, void **input_data)
{
void *x_input = NULL;
#ifdef HAVE_UDEV
settings_t *settings = config_get_ptr();
@ -917,9 +918,9 @@ static void gfx_ctx_x_input_driver(void *data,
}
#endif
void *xinput = input_x.init(joypad_name);
*input = xinput ? &input_x : NULL;
*input_data = xinput;
x_input = input_x.init(joypad_name);
*input = x_input ? &input_x : NULL;
*input_data = x_input;
}
static bool gfx_ctx_x_suppress_screensaver(void *data, bool enable)

View File

@ -54,7 +54,7 @@
#include "../../gfx/video_driver.h"
#include "../common/linux_common.h"
#include "../common/epoll_common.h"
#include "../configuration.h"
#include "../../configuration.h"
#include "../../verbosity.h"

View File

@ -4330,13 +4330,14 @@ static int action_ok_netplay_enable_client(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
#ifdef HAVE_NETWORKING
menu_input_ctx_line_t line;
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
/* If no host was specified in the config, ask for one */
menu_input_ctx_line_t line;
memset(&line, 0, sizeof(line));
line.label = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS);
line.label_setting = "no_setting";
line.cb = action_ok_netplay_enable_client_hostname_cb;

View File

@ -4130,13 +4130,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_MUSIC_LIST:
{
char combined_path[PATH_MAX_LENGTH];
const char *ext = NULL;
combined_path[0] = '\0';
fill_pathname_join(combined_path, menu->scratch2_buf,
menu->scratch_buf, sizeof(combined_path));
const char *ext = path_get_extension(combined_path);
ext = path_get_extension(combined_path);
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);