From d6906ee7dfd4b385c2864b9aac5323357939d7f2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 19 Feb 2016 15:43:12 +0100
Subject: [PATCH] (xcb) Buildfix

---
 Makefile.common            |  5 +++++
 gfx/common/vulkan_common.c | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index 5d3e578df2..b07f4ae2ac 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -513,6 +513,11 @@ ifeq ($(HAVE_X11), 1)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
 
+ifeq ($(HAVE_XCB),1)
+	DEFINES += $(XCB_CFLAGS)
+	LIBS    += $(XCB_LIBS) -lX11-xcb
+endif
+
 ifeq ($(HAVE_XKBCOMMON), 1)
    DEFINES += $(XKBCOMMON_CFLAGS)
    OBJ += input/drivers_keyboard/keyboard_event_xkb.o
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index b90badcf7f..7c5a55eee2 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -13,6 +13,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#ifdef HAVE_XCB
+#include <X11/Xlib-xcb.h>
+#endif
+
 #include <retro_assert.h>
 
 #include "vulkan_common.h"
@@ -1087,7 +1095,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
             surf_info.sType      = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
             surf_info.flags      = 0;
             surf_info.connection = XGetXCBConnection(display);
-            surf_info.window     = (xcb_window_t)surface;
+            surf_info.window     = surface;
 
             if (vk->fpCreateXcbSurfaceKHR(vk->context.instance,
                      &surf_info, NULL, &vk->vk_surface)