From 1b0420807bfb4600d6a06c1a848af90fc8e54457 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 29 Mar 2018 15:15:47 +0200
Subject: [PATCH] (Griffin/MSVC) buildfixes

---
 core_impl.c                          |  4 ++--
 libretro-common/compat/unlink_utf8.c |  2 +-
 runahead/run_ahead.c                 | 13 ++++++++-----
 runahead/secondary_core.c            |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core_impl.c b/core_impl.c
index 245f1bc31f..ce33e8e4d0 100644
--- a/core_impl.c
+++ b/core_impl.c
@@ -283,11 +283,11 @@ bool core_get_memory(retro_ctx_memory_info_t *info)
 
 bool core_load_game(retro_ctx_load_content_info_t *load_info)
 {
-   set_load_content_info(load_info);
-
    bool contentless = false;
    bool is_inited   = false;
 
+   set_load_content_info(load_info);
+
    content_get_status(&contentless, &is_inited);
 
    if (load_info && load_info->special)
diff --git a/libretro-common/compat/unlink_utf8.c b/libretro-common/compat/unlink_utf8.c
index ce3bcad01e..8ca47c7790 100644
--- a/libretro-common/compat/unlink_utf8.c
+++ b/libretro-common/compat/unlink_utf8.c
@@ -18,7 +18,7 @@
 bool unlink_utf8(const char * filename)
 {
 #if defined(LEGACY_WIN32)
-	bool result = DeleteFileA(filename_w);
+	bool result = DeleteFileA(filename);
 #else
 	wchar_t * filename_w = utf8_to_utf16_string_alloc(filename);
 	bool result = DeleteFileW(filename_w);
diff --git a/runahead/run_ahead.c b/runahead/run_ahead.c
index 2c9acca268..bf79fe1fa9 100644
--- a/runahead/run_ahead.c
+++ b/runahead/run_ahead.c
@@ -1,15 +1,18 @@
-#include "core.h"
-#include "dynamic.h"
-#include "audio/audio_driver.h"
-#include "gfx/video_driver.h"
-#include "boolean.h"
 #include <stddef.h>
 #include <malloc.h>
 #include <string.h>
+
+#include <boolean.h>
+
 #include "dirty_input.h"
 #include "mylist.h"
 #include "secondary_core.h"
 
+#include "../core.h"
+#include "../dynamic.h"
+#include "../audio/audio_driver.h"
+#include "../gfx/video_driver.h"
+
 static void *runahead_save_state_alloc(void);
 static void runahead_save_state_free(void *state);
 static void runahead_save_state_list_init(size_t saveStateSize);
diff --git a/runahead/secondary_core.c b/runahead/secondary_core.c
index a6cf197d56..845299319c 100644
--- a/runahead/secondary_core.c
+++ b/runahead/secondary_core.c
@@ -15,12 +15,12 @@
 #include <compat/fopen_utf8.h>
 #include <compat/unlink_utf8.h>
 #include <dynamic/dylib.h>
-#include <dynamic.h>
 #include <file/file_path.h>
 
 #include "mem_util.h"
 
 #include "../core.h"
+#include "../dynamic.h"
 #include "../paths.h"
 #include "../content.h"