From b14dfc258568cecd98264f9675f4f01a9edb4b04 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 4 Jul 2019 04:40:13 +0200
Subject: [PATCH] Revert "(UWP) Fix VFS"

This reverts commit 163ec0f979c6a1a4d354efaf7618eda8cf440109.
---
 libretro-common/include/vfs/vfs_implementation.h | 11 -----------
 libretro-common/vfs/vfs_implementation_uwp.cpp   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/libretro-common/include/vfs/vfs_implementation.h b/libretro-common/include/vfs/vfs_implementation.h
index 4bd6b9ea44..9b69b7eb81 100644
--- a/libretro-common/include/vfs/vfs_implementation.h
+++ b/libretro-common/include/vfs/vfs_implementation.h
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <libretro.h>
-#include <retro_environment.h>
 
 #ifdef HAVE_CDROM
 #include <vfs/vfs_implementation_cdrom.h>
@@ -48,15 +47,6 @@ struct retro_vfs_file_handle
 struct libretro_vfs_implementation_file
 #endif
 {
-#ifdef __WINRT__
-   IRandomAccessStream^ fp;
-   IBuffer^ bufferp;
-   char* buffer;
-   char* orig_path;
-   size_t buffer_size;
-   int buffer_left;
-   size_t buffer_fill;
-#else
    int fd;
    unsigned hints;
    int64_t size;
@@ -73,7 +63,6 @@ struct libretro_vfs_implementation_file
 #ifdef HAVE_CDROM
    vfs_cdrom_t cdrom;
 #endif
-#endif
 };
 
 /* Replace the following symbol with something appropriate
diff --git a/libretro-common/vfs/vfs_implementation_uwp.cpp b/libretro-common/vfs/vfs_implementation_uwp.cpp
index 1c4be18e70..ef685fcd16 100644
--- a/libretro-common/vfs/vfs_implementation_uwp.cpp
+++ b/libretro-common/vfs/vfs_implementation_uwp.cpp
@@ -328,6 +328,21 @@ IBuffer^ CreateNativeBuffer(void* buf, uint32_t capacity, uint32_t length)
 	return buffer;
 }
 
+#ifdef VFS_FRONTEND
+struct retro_vfs_file_handle
+#else
+struct libretro_vfs_implementation_file
+#endif
+{
+	IRandomAccessStream^ fp;
+	IBuffer^ bufferp;
+	char* buffer;
+	char* orig_path;
+	size_t buffer_size;
+	int buffer_left;
+	size_t buffer_fill;
+};
+
 libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, unsigned mode, unsigned hints)
 {
 	if (!path || !*path)