From adb2942e5c01cbb8631303012f6f527863425aa7 Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Fri, 26 Jun 2015 18:39:20 +0200
Subject: [PATCH] Fix CXX_BUILD

---
 gfx/drivers_context/wayland_ctx.c | 1 -
 libretro-db/rmsgpack_dom.h        | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index e3d697acc4..5c7028cf20 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -21,7 +21,6 @@
 #include "../drivers/gl_common.h"
 
 #include <wayland-client.h>
-#include <wayland-client-protocol.h>
 #include <wayland-egl.h>
 
 #include <EGL/egl.h>
diff --git a/libretro-db/rmsgpack_dom.h b/libretro-db/rmsgpack_dom.h
index 733def69bf..30a7d01fe2 100644
--- a/libretro-db/rmsgpack_dom.h
+++ b/libretro-db/rmsgpack_dom.h
@@ -24,20 +24,20 @@ struct rmsgpack_dom_value {
 	union {
 		uint64_t uint_;
 		int64_t int_;
-		struct string_t {
+		struct {
 			uint32_t len;
 			char * buff;
 		} string;
-		struct binary_t {
+		struct {
 			uint32_t len;
 			char * buff;
 		} binary;
 		int bool_;
-		struct map_t {
+		struct {
 			uint32_t len;
 			struct rmsgpack_dom_pair * items;
 		} map;
-		struct array_t {
+		struct {
 			uint32_t len;
 			struct rmsgpack_dom_value * items;
 		} array;