From c66d6c7457427be56793e36703d1f6da63aa1b7b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 16 Dec 2015 16:55:52 +0100
Subject: [PATCH 1/2] Address MS Visual Studio 2015 update 1 breaking changes

---
 src/bind_tolua.c  | 1 +
 src/kernel/save.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bind_tolua.c b/src/bind_tolua.c
index c6df54a10..9a5b8e184 100644
--- a/src/bind_tolua.c
+++ b/src/bind_tolua.c
@@ -8,6 +8,7 @@
 #include "log.pkg.c"
 #include "process.pkg.c"
 #include "settings.pkg.c"
+#pragma warning(pop)
 
 void tolua_bind_open(lua_State * L) {
     tolua_eressea_open(L);
diff --git a/src/kernel/save.c b/src/kernel/save.c
index 0fae07bb4..d4df2b6f8 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "save.h"
 
-#include "../buildno.h"
+#include <buildno.h>
 
 #include "alchemy.h"
 #include "alliance.h"

From fadccb5bd615d30667f7b7e72c1bc0f3f2891c2c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 16 Dec 2015 17:02:29 +0100
Subject: [PATCH 2/2] MS Visual Studio 2015 update 1 breaking changes (relative
 include files)

---
 src/triggers/shock.test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/triggers/shock.test.c b/src/triggers/shock.test.c
index 8957c33fc..eae2a5004 100644
--- a/src/triggers/shock.test.c
+++ b/src/triggers/shock.test.c
@@ -1,7 +1,7 @@
 #include <platform.h>
 #include "shock.h"
-#include "../magic.h"
 
+#include <magic.h>
 #include <kernel/unit.h>
 #include <kernel/faction.h>
 #include <util/event.h>