diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-04 11:46:32 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-04 11:46:32 +0200 |
| commit | a9d221b74bed83a2d73ab2c9b23780aada51c6df (patch) | |
| tree | 77fea7b838863eed53d85b22852a5156e628d744 /source | |
| parent | LuaWindow: Fixed memory leaks with unclosed windows (diff) | |
| download | cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar.gz cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar.bz2 cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar.lz cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar.xz cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.tar.zst cuberite-a9d221b74bed83a2d73ab2c9b23780aada51c6df.zip | |
Diffstat (limited to 'source')
| -rw-r--r-- | source/BlockID.h | 2 | ||||
| -rw-r--r-- | source/ManualBindings.cpp | 4 | ||||
| -rw-r--r-- | source/StringUtils.cpp | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 0cea35f12..44d1b3ad1 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -593,7 +593,7 @@ enum E_ENTITY_TYPE_IRON_GOLEM = 99, E_ENTITY_TYPE_VILLAGER = 120, } ; -//tolua_end +// tolua_end diff --git a/source/ManualBindings.cpp b/source/ManualBindings.cpp index 0f8f1ad27..8d7fe9c42 100644 --- a/source/ManualBindings.cpp +++ b/source/ManualBindings.cpp @@ -1316,8 +1316,8 @@ void ManualBindings::Bind( lua_State* tolua_S ) tolua_cclass(tolua_S,"HTTPRequest","HTTPRequest","",NULL); tolua_beginmodule(tolua_S,"HTTPRequest"); - //tolua_variable(tolua_S,"Method",tolua_get_HTTPRequest_Method,tolua_set_HTTPRequest_Method); - //tolua_variable(tolua_S,"Path",tolua_get_HTTPRequest_Path,tolua_set_HTTPRequest_Path); + // tolua_variable(tolua_S,"Method",tolua_get_HTTPRequest_Method,tolua_set_HTTPRequest_Method); + // tolua_variable(tolua_S,"Path",tolua_get_HTTPRequest_Path,tolua_set_HTTPRequest_Path); tolua_variable(tolua_S,"Params",tolua_get_HTTPRequest_Params,0); tolua_variable(tolua_S,"PostParams",tolua_get_HTTPRequest_PostParams,0); tolua_variable(tolua_S,"FormData",tolua_get_HTTPRequest_FormData,0); diff --git a/source/StringUtils.cpp b/source/StringUtils.cpp index 536281054..da809c5a4 100644 --- a/source/StringUtils.cpp +++ b/source/StringUtils.cpp @@ -9,6 +9,12 @@ #include <ctype.h> #endif +#ifdef _MSC_VER + // Under MSVC, link to WinSock2 (needed by RawBEToUTF8's byteswapping) + #pragma comment(lib, "ws2_32.lib") +#endif + + |