From 39869aaa25ca577faa0da2b6cb83db6db7234342 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Fri, 22 May 2015 18:26:18 +0200
Subject: [PATCH] Fix Windows build, clean up included headers
Also fix a startup error caused by s_security.cpp
---
src/objdef.cpp | 3 ---
src/objdef.h | 4 +---
src/script/cpp_api/s_security.cpp | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/objdef.cpp b/src/objdef.cpp
index 465bea44c..08d6844fc 100644
--- a/src/objdef.cpp
+++ b/src/objdef.cpp
@@ -17,11 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <strings.h>
#include "objdef.h"
#include "util/numeric.h"
-#include "debug.h"
-#include "porting.h"
#include "log.h"
#include "gamedef.h"
diff --git a/src/objdef.h b/src/objdef.h
index 9e0c0b001..65e5c0176 100644
--- a/src/objdef.h
+++ b/src/objdef.h
@@ -20,9 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef OBJDEF_HEADER
#define OBJDEF_HEADER
-#include <string>
-#include <vector>
-#include "irrlichttypes.h"
+#include "porting.h"
class IGameDef;
class INodeDefManager;
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index abe5b3e97..c46483e95 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -264,7 +264,7 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
fp = stdin;
chunk_name = const_cast<char *>("=stdin");
} else {
- fp = fopen(path, "r");
+ fp = fopen(path, "rb");
if (!fp) {
lua_pushfstring(L, "%s: %s", path, strerror(errno));
return false;
--
GitLab