Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build, clean up included headers

Browse Source 
Also fix a startup error caused by s_security.cpp
This commit is contained in:
SmallJoker 2015-05-22 18:26:18 +02:00 committed by est31
parent e13d2bafc6
commit 39869aaa25
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/objdef.cpp
View File

@ -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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <strings.h>
#include "objdef.h" #include "objdef.h"
#include "util/numeric.h" #include "util/numeric.h"
#include "debug.h"
#include "porting.h"
#include "log.h" #include "log.h"
#include "gamedef.h" #include "gamedef.h"

4
src/objdef.h
View File

@ -20,9 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef OBJDEF_HEADER #ifndef OBJDEF_HEADER
#define OBJDEF_HEADER #define OBJDEF_HEADER
#include <string> #include "porting.h"
#include <vector>
#include "irrlichttypes.h"
class IGameDef; class IGameDef;
class INodeDefManager; class INodeDefManager;

2
src/script/cpp_api/s_security.cpp
View File

@ -264,7 +264,7 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
fp = stdin; fp = stdin;
chunk_name = const_cast<char *>("=stdin"); chunk_name = const_cast<char *>("=stdin");
} else { } else {
fp = fopen(path, "r"); fp = fopen(path, "rb");
if (!fp) { if (!fp) {
lua_pushfstring(L, "%s: %s", path, strerror(errno)); lua_pushfstring(L, "%s: %s", path, strerror(errno));
return false; return false;