Fix Windows build, clean up included headers

Also fix a startup error caused by s_security.cpp
minetest · May 22, 2015 · 39869aa · 39869aa
1 parent e13d2ba
commit 39869aa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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;