From 6fcb97ee53c6a1966318405e4a452585c79c552f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 30 Jun 2020 08:37:41 +0200
Subject: [PATCH] Some buildfixes

---
 frontend/drivers/platform_win32.c | 10 ++++++++++
 frontend/drivers/platform_win32.h |  4 ----
 gfx/gfx_display.h                 |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 0b02da81d4..5946c2a362 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -177,6 +177,16 @@ enum retro_language win32_get_retro_lang_from_langid(unsigned short langid)
    return RETRO_LANGUAGE_ENGLISH;
 }
 #endif
+#else
+unsigned short win32_get_langid_from_retro_lang(enum retro_language lang)
+{
+   return 0x409; /* fallback to US English */
+}
+
+enum retro_language win32_get_retro_lang_from_langid(unsigned short langid)
+{
+   return RETRO_LANGUAGE_ENGLISH;
+}
 #endif
 
 static void gfx_dwm_shutdown(void)
diff --git a/frontend/drivers/platform_win32.h b/frontend/drivers/platform_win32.h
index de8de6c321..8843d7ce63 100644
--- a/frontend/drivers/platform_win32.h
+++ b/frontend/drivers/platform_win32.h
@@ -19,12 +19,8 @@
 #ifndef _PLATFORM_WIN32_H
 #define _PLATFORM_WIN32_H
 
-#if defined(HAVE_LANGEXTRA) && !defined(_XBOX)
-#if (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500) || !defined(_MSC_VER)
 unsigned short win32_get_langid_from_retro_lang(enum retro_language lang);
 
 enum retro_language win32_get_retro_lang_from_langid(unsigned short langid);
-#endif
-#endif
 
 #endif
diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
index f5a5403159..933fd02e70 100644
--- a/gfx/gfx_display.h
+++ b/gfx/gfx_display.h
@@ -26,6 +26,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 #include <string/stdstring.h>
+#include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
 
 #include "../retroarch.h"
@@ -380,7 +381,8 @@ bool gfx_display_reset_textures_list(
 
 bool gfx_display_reset_textures_list_buffer(
         uintptr_t *item, enum texture_filter_type filter_type,
-        void* buffer, unsigned buffer_len, enum image_type_enum image_type,
+        void* buffer, unsigned buffer_len,
+        enum image_type_enum image_type,
         unsigned *width, unsigned *height);
 
 /* Returns the OSK key at a given position */