mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespace conflicts

Browse Source
This commit is contained in:
twinaphex 2016-07-27 21:28:33 +02:00
parent cca2724f52
commit b9aa9a6b1e
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
input/input_remote.c
View File

@ -38,7 +38,8 @@
#define DEFAULT_NETWORK_GAMEPAD_PORT 55400 #define DEFAULT_NETWORK_GAMEPAD_PORT 55400
#define UDP_FRAME_PACKETS 16 #define UDP_FRAME_PACKETS 16
struct message { struct remote_message
{
int port; int port;
int device; int device;
int index; int index;
@ -159,7 +160,7 @@ void input_remote_free(input_remote_t *handle)
} }
#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY)
static void input_remote_parse_packet(struct message *msg, unsigned user) static void input_remote_parse_packet(struct remote_message *msg, unsigned user)
{ {
input_remote_state_t *ol_state = input_remote_get_state_ptr(); input_remote_state_t *ol_state = input_remote_get_state_ptr();
@ -232,7 +233,7 @@ void input_remote_poll(input_remote_t *handle)
if (settings->network_remote_enable_user[user]) if (settings->network_remote_enable_user[user])
{ {
#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY)
struct message msg; struct remote_message msg;
ssize_t ret; ssize_t ret;
fd_set fds; fd_set fds;

3
intl/msg_hash_us.c
View File

@ -204,6 +204,9 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
switch (msg) switch (msg)
{ {
case MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE:
snprintf(s, len, "Compressed archive file.");
break;
case MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG: case MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG:
snprintf(s, len, "Recording configuration file."); snprintf(s, len, "Recording configuration file.");
break; break;

3
menu/drivers/menu_generic.c
View File

@ -379,6 +379,9 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
case FILE_TYPE_CONFIG: case FILE_TYPE_CONFIG:
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CONFIG; enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CONFIG;
break; break;
case FILE_TYPE_CARCHIVE:
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE;
break;
case FILE_TYPE_VIDEOFILTER: /* TODO/FIXME */ case FILE_TYPE_VIDEOFILTER: /* TODO/FIXME */
case FILE_TYPE_AUDIOFILTER: /* TODO/FIXME */ case FILE_TYPE_AUDIOFILTER: /* TODO/FIXME */
case FILE_TYPE_SHADER_SLANG: /* TODO/FIXME */ case FILE_TYPE_SHADER_SLANG: /* TODO/FIXME */

1
msg_hash.h
View File

@ -597,6 +597,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
MENU_ENUM_LABEL_FILE_CONFIG, MENU_ENUM_LABEL_FILE_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,
MENU_ENUM_LABEL_FILE_BROWSER_CONFIG, MENU_ENUM_LABEL_FILE_BROWSER_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG, MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_CURSOR, MENU_ENUM_LABEL_FILE_BROWSER_CURSOR,