From 3691f4fabf770b7b5a243b4e0a0cd0c0ec71016c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 13 Mar 2019 17:00:52 +0100
Subject: [PATCH] Fix CXX_BUILD errors

---
 gfx/common/d3d12_common.c | 2 +-
 gfx/drivers/gl_core.c     | 1 +
 retroarch.c               | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gfx/common/d3d12_common.c b/gfx/common/d3d12_common.c
index f221d8ca58..873d7ad0c9 100644
--- a/gfx/common/d3d12_common.c
+++ b/gfx/common/d3d12_common.c
@@ -190,7 +190,7 @@ bool d3d12_init_base(d3d12_video_t* d3d12)
 
             IDXGIAdapter_GetDesc(d3d12->adapter, &desc);
 
-            utf16_to_char_string(desc.Description, str, sizeof(str));
+            utf16_to_char_string((const uint16_t*)desc.Description, str, sizeof(str));
 
             RARCH_LOG("[D3D12]: Using GPU: %s\n", str);
 
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index d65c70cfd7..2a7e3d8a63 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -23,6 +23,7 @@
 #include <gfx/video_frame.h>
 #include <glsym/glsym.h>
 #include <string/stdstring.h>
+#include <retro_math.h>
 
 #include "../../configuration.h"
 #include "../../dynamic.h"
diff --git a/retroarch.c b/retroarch.c
index 838824f2bc..e7afc9bfff 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4791,10 +4791,11 @@ bool rarch_write_debug_info(void)
 
    {
       float width = 0, height = 0, refresh = 0.0f;
-      gfx_ctx_metrics_t metrics = {0};
-
-      metrics.type = DISPLAY_METRIC_PIXEL_WIDTH;
+      gfx_ctx_metrics_t metrics;
+      
+      metrics.type  = DISPLAY_METRIC_PIXEL_WIDTH;
       metrics.value = &width;
+
       video_context_driver_get_metrics(&metrics);
 
       metrics.type = DISPLAY_METRIC_PIXEL_HEIGHT;