diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 10:58:50 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 10:58:50 +0200 |
| commit | 0b3f1a0e088575988beaaea11b3e32a0bd26f63a (patch) | |
| tree | 6d19a10e4280d127e06409be785faa9e5450ec9a /src | |
| parent | c53b92a2da701e0ae8c0263ab92344dd418558c2 (diff) | |
| download | crawler-0b3f1a0e088575988beaaea11b3e32a0bd26f63a.tar.gz crawler-0b3f1a0e088575988beaaea11b3e32a0bd26f63a.tar.bz2 | |
tolua test runs on Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/libluaglue/LuaVM.cpp | 8 | ||||
| -rwxr-xr-x | src/libluaglue/Makefile.W32 | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/libluaglue/LuaVM.cpp b/src/libluaglue/LuaVM.cpp index e75a1c9..637f668 100644 --- a/src/libluaglue/LuaVM.cpp +++ b/src/libluaglue/LuaVM.cpp @@ -1,6 +1,10 @@ #include "LuaVM.hpp" #include "StringUtils.hpp" +#ifdef _WIN32 +#define snprintf _snprintf +#endif +#define __STDC_FORMAT_MACROS #include "util/IntTypes.hpp" #include <stdexcept> @@ -226,7 +230,7 @@ int LuaVM::findValue( const string &key ) } lua_getglobal( m_lua, parts[0].c_str( ) ); - for( size_t i = 1; i <= parts.size( ) - 1; i++ ) { + for( int i = 1; i <= (int)parts.size( ) - 1; i++ ) { if( !lua_istable( m_lua, -1 ) ) { lua_pop( m_lua, i ); ostringstream ss; @@ -237,7 +241,7 @@ int LuaVM::findValue( const string &key ) } if( lua_isnil( m_lua, -1 ) ) { - lua_pop( m_lua, parts.size( ) ); + lua_pop( m_lua, (int)parts.size( ) ); ostringstream ss; ss << "key '" << key << "' refers to an empty element"; throw runtime_error( ss.str( ) ); diff --git a/src/libluaglue/Makefile.W32 b/src/libluaglue/Makefile.W32 index fa7a015..855a7a7 100755 --- a/src/libluaglue/Makefile.W32 +++ b/src/libluaglue/Makefile.W32 @@ -18,6 +18,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ + $(TOPDIR)\src\libutil\util.lib \ $(TOPDIR)\lua\src\lua52.lib CPP_OBJS = \ |