summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-03-22 16:28:49 +0100
committerMattes D <github@xoft.cz>2014-03-22 16:28:49 +0100
commit4497f1166bd56aea17fe7b4b11ecb56607aed6e5 (patch)
tree111fe0c36643afd27317b8d9a4c7912b6899ec4a
parentImplemented faster upscaling using templates. (diff)
parentMerge branch 'master' into size_t_lua (diff)
downloadcuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar.gz
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar.bz2
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar.lz
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar.xz
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.tar.zst
cuberite-4497f1166bd56aea17fe7b4b11ecb56607aed6e5.zip
Diffstat (limited to '')
-rw-r--r--lib/tolua++/src/bin/basic_lua.h4
-rw-r--r--lib/tolua++/src/bin/lua/basic.lua1
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/tolua++/src/bin/basic_lua.h b/lib/tolua++/src/bin/basic_lua.h
index 2128cb44b..effd79ee9 100644
--- a/lib/tolua++/src/bin/basic_lua.h
+++ b/lib/tolua++/src/bin/basic_lua.h
@@ -61,6 +61,8 @@ static const unsigned char lua_basic_lua[] = {
0x3d, 0x20, 0x27, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x27, 0x2c, 0x0a,
0x20, 0x5b, 0x27, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x27, 0x5d, 0x20,
0x3d, 0x20, 0x27, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x27, 0x2c, 0x0a,
+ 0x20, 0x5b, 0x27, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x74, 0x27, 0x5d, 0x20,
+ 0x3d, 0x20, 0x27, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x27, 0x2c, 0x0a,
0x20, 0x5b, 0x27, 0x5f, 0x63, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27,
0x5d, 0x20, 0x3d, 0x20, 0x27, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27,
0x2c, 0x0a, 0x20, 0x5b, 0x27, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x64, 0x61,
@@ -755,4 +757,4 @@ static const unsigned char lua_basic_lua[] = {
0x73, 0x65, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0x0a, 0x65, 0x6e, 0x64,
0x0a
};
-unsigned int lua_basic_lua_len = 9049;
+unsigned int lua_basic_lua_len = 9073;
diff --git a/lib/tolua++/src/bin/lua/basic.lua b/lib/tolua++/src/bin/lua/basic.lua
index 425cb6861..4bff5276b 100644
--- a/lib/tolua++/src/bin/lua/basic.lua
+++ b/lib/tolua++/src/bin/lua/basic.lua
@@ -23,6 +23,7 @@ _basic = {
['unsigned'] = 'number',
['float'] = 'number',
['double'] = 'number',
+ ['size_t'] = 'number',
['_cstring'] = 'string',
['_userdata'] = 'userdata',
['char*'] = 'string',