diff options
| author | SmallJoker <mk939@ymail.com> | 2015-05-22 18:26:18 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-05-22 20:37:59 +0200 |
| commit | 39869aaa25ca577faa0da2b6cb83db6db7234342 (patch) | |
| tree | b438972c521ce39613b55724879d12a76c270201 /src | |
| parent | e13d2bafc6d0a4fb0d42cf9c229012f4a4f17131 (diff) | |
| download | minetest-39869aaa25ca577faa0da2b6cb83db6db7234342.tar.gz minetest-39869aaa25ca577faa0da2b6cb83db6db7234342.tar.bz2 minetest-39869aaa25ca577faa0da2b6cb83db6db7234342.zip | |
Fix Windows build, clean up included headers
Also fix a startup error caused by s_security.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/objdef.cpp | 3 | ||||
| -rw-r--r-- | src/objdef.h | 4 | ||||
| -rw-r--r-- | 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; |