diff -up ./cmake/Modules/FindLuaJIT.cmake.orig ./cmake/Modules/FindLuaJIT.cmake
--- ./cmake/Modules/FindLuaJIT.cmake.orig 2018-10-19 16:40:53.101424497 +0000
+++ ./cmake/Modules/FindLuaJIT.cmake 2018-10-19 16:41:23.894970753 +0000
@@ -9,7 +9,7 @@
FIND_PATH(LUA_INCLUDE_DIR luajit.h
HINTS
$ENV{LUA_DIR}
- PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
+ PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.0 include
PATHS
~/Library/Frameworks
/Library/Frameworks
diff -up ./src/script/lua_api/l_object.h.orig ./src/script/lua_api/l_object.h
--- ./src/script/lua_api/l_object.h.orig 2018-10-19 16:53:26.939285461 +0000
+++ ./src/script/lua_api/l_object.h 2018-10-19 16:53:35.815731476 +0000
@@ -40,7 +40,7 @@ private:
ServerActiveObject *m_object;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
public:
static ObjectRef *checkobject(lua_State *L, int narg);
diff -up ./src/script/lua_api/l_areastore.cpp.orig ./src/script/lua_api/l_areastore.cpp
--- ./src/script/lua_api/l_areastore.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_areastore.cpp 2018-10-19 17:00:32.568678276 +0000
@@ -377,7 +377,7 @@ void LuaAreaStore::Register(lua_State *L
}
const char LuaAreaStore::className[] = "AreaStore";
-const luaL_reg LuaAreaStore::methods[] = {
+const luaL_Reg LuaAreaStore::methods[] = {
luamethod(LuaAreaStore, get_area),
luamethod(LuaAreaStore, get_areas_for_pos),
luamethod(LuaAreaStore, get_areas_in_area),
diff -up ./src/script/lua_api/l_areastore.h.orig ./src/script/lua_api/l_areastore.h
--- ./src/script/lua_api/l_areastore.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_areastore.h 2018-10-19 17:00:32.576678678 +0000
@@ -29,7 +29,7 @@ class LuaAreaStore : public ModApiBase {
private:
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
static int gc_object(lua_State *L);
diff -up ./src/script/lua_api/l_inventory.cpp.orig ./src/script/lua_api/l_inventory.cpp
--- ./src/script/lua_api/l_inventory.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_inventory.cpp 2018-10-19 17:00:32.588679282 +0000
@@ -466,7 +466,7 @@ void InvRef::Register(lua_State *L)
}
const char InvRef::className[] = "InvRef";
-const luaL_reg InvRef::methods[] = {
+const luaL_Reg InvRef::methods[] = {
luamethod(InvRef, is_empty),
luamethod(InvRef, get_size),
luamethod(InvRef, set_size),
diff -up ./src/script/lua_api/l_inventory.h.orig ./src/script/lua_api/l_inventory.h
--- ./src/script/lua_api/l_inventory.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_inventory.h 2018-10-19 17:00:32.600679885 +0000
@@ -39,7 +39,7 @@ private:
InventoryLocation m_loc;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
static InvRef *checkobject(lua_State *L, int narg);
diff -up ./src/script/lua_api/l_item.cpp.orig ./src/script/lua_api/l_item.cpp
--- ./src/script/lua_api/l_item.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_item.cpp 2018-10-19 17:00:32.612680489 +0000
@@ -438,7 +438,7 @@ void LuaItemStack::Register(lua_State *L
}
const char LuaItemStack::className[] = "ItemStack";
-const luaL_reg LuaItemStack::methods[] = {
+const luaL_Reg LuaItemStack::methods[] = {
luamethod(LuaItemStack, is_empty),
luamethod(LuaItemStack, get_name),
luamethod(LuaItemStack, set_name),
diff -up ./src/script/lua_api/l_item.h.orig ./src/script/lua_api/l_item.h
--- ./src/script/lua_api/l_item.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_item.h 2018-10-19 17:00:32.624681092 +0000
@@ -31,7 +31,7 @@ private:
ItemStack m_stack;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// Exported functions
diff -up ./src/script/lua_api/l_nodemeta.cpp.orig ./src/script/lua_api/l_nodemeta.cpp
--- ./src/script/lua_api/l_nodemeta.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_nodemeta.cpp 2018-10-19 17:00:32.632681494 +0000
@@ -349,7 +349,7 @@ void NodeMetaRef::Register(lua_State *L)
}
const char NodeMetaRef::className[] = "NodeMetaRef";
-const luaL_reg NodeMetaRef::methods[] = {
+const luaL_Reg NodeMetaRef::methods[] = {
luamethod(NodeMetaRef, get_string),
luamethod(NodeMetaRef, set_string),
luamethod(NodeMetaRef, get_int),
diff -up ./src/script/lua_api/l_nodemeta.h.orig ./src/script/lua_api/l_nodemeta.h
--- ./src/script/lua_api/l_nodemeta.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_nodemeta.h 2018-10-19 17:00:32.640681897 +0000
@@ -38,7 +38,7 @@ private:
ServerEnvironment *m_env;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
static NodeMetaRef *checkobject(lua_State *L, int narg);
diff -up ./src/script/lua_api/l_nodetimer.cpp.orig ./src/script/lua_api/l_nodetimer.cpp
--- ./src/script/lua_api/l_nodetimer.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_nodetimer.cpp 2018-10-19 17:00:32.652682500 +0000
@@ -165,7 +165,7 @@ void NodeTimerRef::Register(lua_State *L
}
const char NodeTimerRef::className[] = "NodeTimerRef";
-const luaL_reg NodeTimerRef::methods[] = {
+const luaL_Reg NodeTimerRef::methods[] = {
luamethod(NodeTimerRef, start),
luamethod(NodeTimerRef, set),
luamethod(NodeTimerRef, stop),
diff -up ./src/script/lua_api/l_nodetimer.h.orig ./src/script/lua_api/l_nodetimer.h
--- ./src/script/lua_api/l_nodetimer.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_nodetimer.h 2018-10-19 17:00:32.660682902 +0000
@@ -34,7 +34,7 @@ private:
ServerEnvironment *m_env;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
static int gc_object(lua_State *L);
diff -up ./src/script/lua_api/l_noise.cpp.orig ./src/script/lua_api/l_noise.cpp
--- ./src/script/lua_api/l_noise.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_noise.cpp 2018-10-19 17:00:32.672683506 +0000
@@ -138,7 +138,7 @@ void LuaPerlinNoise::Register(lua_State
const char LuaPerlinNoise::className[] = "PerlinNoise";
-const luaL_reg LuaPerlinNoise::methods[] = {
+const luaL_Reg LuaPerlinNoise::methods[] = {
luamethod(LuaPerlinNoise, get2d),
luamethod(LuaPerlinNoise, get3d),
{0,0}
@@ -396,7 +396,7 @@ void LuaPerlinNoiseMap::Register(lua_Sta
const char LuaPerlinNoiseMap::className[] = "PerlinNoiseMap";
-const luaL_reg LuaPerlinNoiseMap::methods[] = {
+const luaL_Reg LuaPerlinNoiseMap::methods[] = {
luamethod(LuaPerlinNoiseMap, get2dMap),
luamethod(LuaPerlinNoiseMap, get2dMap_flat),
luamethod(LuaPerlinNoiseMap, calc2dMap),
@@ -501,7 +501,7 @@ void LuaPseudoRandom::Register(lua_State
const char LuaPseudoRandom::className[] = "PseudoRandom";
-const luaL_reg LuaPseudoRandom::methods[] = {
+const luaL_Reg LuaPseudoRandom::methods[] = {
luamethod(LuaPseudoRandom, next),
{0,0}
};
@@ -600,7 +600,7 @@ void LuaPcgRandom::Register(lua_State *L
const char LuaPcgRandom::className[] = "PcgRandom";
-const luaL_reg LuaPcgRandom::methods[] = {
+const luaL_Reg LuaPcgRandom::methods[] = {
luamethod(LuaPcgRandom, next),
luamethod(LuaPcgRandom, rand_normal_dist),
{0,0}
@@ -714,7 +714,7 @@ void LuaSecureRandom::Register(lua_State
}
const char LuaSecureRandom::className[] = "SecureRandom";
-const luaL_reg LuaSecureRandom::methods[] = {
+const luaL_Reg LuaSecureRandom::methods[] = {
luamethod(LuaSecureRandom, next_bytes),
{0,0}
};
diff -up ./src/script/lua_api/l_noise.h.orig ./src/script/lua_api/l_noise.h
--- ./src/script/lua_api/l_noise.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_noise.h 2018-10-19 17:00:32.684684109 +0000
@@ -34,7 +34,7 @@ class LuaPerlinNoise : public ModApiBase
private:
NoiseParams np;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// Exported functions
@@ -65,7 +65,7 @@ class LuaPerlinNoiseMap : public ModApiB
Noise *noise;
bool m_is3d;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// Exported functions
@@ -103,7 +103,7 @@ private:
PseudoRandom m_pseudo;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// Exported functions
@@ -134,7 +134,7 @@ private:
PcgRandom m_rnd;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// Exported functions
@@ -171,7 +171,7 @@ class LuaSecureRandom : public ModApiBas
private:
static const size_t RAND_BUF_SIZE = 2048;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
u32 m_rand_idx;
char m_rand_buf[RAND_BUF_SIZE];
diff -up ./src/script/lua_api/l_object.cpp.orig ./src/script/lua_api/l_object.cpp
--- ./src/script/lua_api/l_object.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_object.cpp 2018-10-19 17:00:32.704685115 +0000
@@ -1736,7 +1736,7 @@ void ObjectRef::Register(lua_State *L)
}
const char ObjectRef::className[] = "ObjectRef";
-const luaL_reg ObjectRef::methods[] = {
+const luaL_Reg ObjectRef::methods[] = {
// ServerActiveObject
luamethod(ObjectRef, remove),
luamethod(ObjectRef, getpos),
diff -up ./src/script/lua_api/l_settings.cpp.orig ./src/script/lua_api/l_settings.cpp
--- ./src/script/lua_api/l_settings.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_settings.cpp 2018-10-19 17:00:32.716685719 +0000
@@ -210,7 +210,7 @@ LuaSettings* LuaSettings::checkobject(lu
}
const char LuaSettings::className[] = "Settings";
-const luaL_reg LuaSettings::methods[] = {
+const luaL_Reg LuaSettings::methods[] = {
luamethod(LuaSettings, get),
luamethod(LuaSettings, get_bool),
luamethod(LuaSettings, set),
diff -up ./src/script/lua_api/l_settings.h.orig ./src/script/lua_api/l_settings.h
--- ./src/script/lua_api/l_settings.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_settings.h 2018-10-19 17:00:32.724686121 +0000
@@ -30,7 +30,7 @@ class Settings;
class LuaSettings : public ModApiBase {
private:
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
// garbage collector
static int gc_object(lua_State* L);
diff -up ./src/script/lua_api/l_vmanip.cpp.orig ./src/script/lua_api/l_vmanip.cpp
--- ./src/script/lua_api/l_vmanip.cpp.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_vmanip.cpp 2018-10-19 17:00:32.736686725 +0000
@@ -462,7 +462,7 @@ void LuaVoxelManip::Register(lua_State *
}
const char LuaVoxelManip::className[] = "VoxelManip";
-const luaL_reg LuaVoxelManip::methods[] = {
+const luaL_Reg LuaVoxelManip::methods[] = {
luamethod(LuaVoxelManip, read_from_map),
luamethod(LuaVoxelManip, get_data),
luamethod(LuaVoxelManip, set_data),
diff -up ./src/script/lua_api/l_vmanip.h.orig ./src/script/lua_api/l_vmanip.h
--- ./src/script/lua_api/l_vmanip.h.orig 2016-05-16 01:59:02.000000000 +0000
+++ ./src/script/lua_api/l_vmanip.h 2018-10-19 17:00:32.744687127 +0000
@@ -40,7 +40,7 @@ private:
bool is_mapgen_vm;
static const char className[];
- static const luaL_reg methods[];
+ static const luaL_Reg methods[];
static int gc_object(lua_State *L);
