From b9aa9a6b1ec080f9c7f10477f17298328d0e2320 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 27 Jul 2016 21:28:33 +0200
Subject: [PATCH] Fix namespace conflicts
---
input/input_remote.c | 7 ++++---
intl/msg_hash_us.c | 3 +++
menu/drivers/menu_generic.c | 3 +++
msg_hash.h | 1 +
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/input/input_remote.c b/input/input_remote.c
index 1227b47df5..6d37b30f1b 100644
--- a/input/input_remote.c
+++ b/input/input_remote.c
@@ -38,7 +38,8 @@
#define DEFAULT_NETWORK_GAMEPAD_PORT 55400
#define UDP_FRAME_PACKETS 16
-struct message {
+struct remote_message
+{
int port;
int device;
int index;
@@ -159,7 +160,7 @@ void input_remote_free(input_remote_t *handle)
}
#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();
@@ -232,7 +233,7 @@ void input_remote_poll(input_remote_t *handle)
if (settings->network_remote_enable_user[user])
{
#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY)
- struct message msg;
+ struct remote_message msg;
ssize_t ret;
fd_set fds;
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 30c7760432..5f304359d0 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -204,6 +204,9 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
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:
snprintf(s, len, "Recording configuration file.");
break;
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index c530e7ab8d..9204dfae68 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -379,6 +379,9 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
case FILE_TYPE_CONFIG:
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CONFIG;
break;
+ case FILE_TYPE_CARCHIVE:
+ enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE;
+ break;
case FILE_TYPE_VIDEOFILTER: /* TODO/FIXME */
case FILE_TYPE_AUDIOFILTER: /* TODO/FIXME */
case FILE_TYPE_SHADER_SLANG: /* TODO/FIXME */
diff --git a/msg_hash.h b/msg_hash.h
index 52fa8ddeb9..491c7a9d0d 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -597,6 +597,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
MENU_ENUM_LABEL_FILE_CONFIG,
+ MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,
MENU_ENUM_LABEL_FILE_BROWSER_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_CURSOR,