Replace luaL_reg with luaL_Reg as recent LuaJIT dropped the Lua 5.0 compat (#5541)

We are bundling Lua5.1 which has same macro

diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 09a5c78f98a544da184f071d3458b7684bd707f9..b81985a7f66129bec05cd9578f6cef20ed4a8ddf 100644 (file)
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -74,7 +74,7 @@ static inline void push_areas(lua_State *L, const std::vector<Area *> &areas,
 static int deserialization_helper(lua_State *L, AreaStore *as,
                std::istream &is)
 {
-       try {   
+       try {
                as->deserialize(is);
        } catch (const SerializationError &e) {
                lua_pushboolean(L, false);
@@ -380,7 +380,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 --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h
index 7dea08df4d1960b8bb60d9db422358dd6eaf86b2..8292e7712e761b6c0aaca2fc51c19f0ded08054f 100644 (file)
--- a/src/script/lua_api/l_areastore.h
+++ b/src/script/lua_api/l_areastore.h
@@ -28,7 +28,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 --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp
index 9a4aa845df1afcf197848563b2e3c631ff5d02f1..f5e76a7b6989cb3c67f440b267b436c594045699 100644 (file)
--- a/src/script/lua_api/l_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -463,7 +463,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 --git a/src/script/lua_api/l_inventory.h b/src/script/lua_api/l_inventory.h
index cc533396563c900b49da643608cc3c5eefda4fd8..91d41c0d02431584b0285877ac8f4d7c3c810ee8 100644 (file)
--- a/src/script/lua_api/l_inventory.h
+++ b/src/script/lua_api/l_inventory.h
@@ -36,7 +36,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 --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 7e6f457e161029dc68da10179476cc6c98f522d4..19b5b09550dd6e9a0b6192844cda8643840c6ee5 100644 (file)
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -462,7 +462,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 --git a/src/script/lua_api/l_item.h b/src/script/lua_api/l_item.h
index 1ba5d79e0f0ccfff529d6a341f09b86e59685403..b4efaefc8d33b259f6964b1b4f39ffae0d411f5e 100644 (file)
--- a/src/script/lua_api/l_item.h
+++ b/src/script/lua_api/l_item.h
@@ -28,7 +28,7 @@ private:
        ItemStack m_stack;
 
        static const char className[];
-       static const luaL_reg methods[];
+       static const luaL_Reg methods[];
 
        // Exported functions
 

diff --git a/src/script/lua_api/l_itemstackmeta.cpp b/src/script/lua_api/l_itemstackmeta.cpp
index 304a7cdf3bef2a6e66e53c2526f997d8673d4304..efdd77b516302923214ab35de8d2c5ec313b2a16 100644 (file)
--- a/src/script/lua_api/l_itemstackmeta.cpp
+++ b/src/script/lua_api/l_itemstackmeta.cpp
@@ -102,7 +102,7 @@ void ItemStackMetaRef::Register(lua_State *L)
 }
 
 const char ItemStackMetaRef::className[] = "ItemStackMetaRef";
-const luaL_reg ItemStackMetaRef::methods[] = {
+const luaL_Reg ItemStackMetaRef::methods[] = {
        luamethod(MetaDataRef, get_string),
        luamethod(MetaDataRef, set_string),
        luamethod(MetaDataRef, get_int),

diff --git a/src/script/lua_api/l_itemstackmeta.h b/src/script/lua_api/l_itemstackmeta.h
index 6f9b2016c70ccb6e7bd468eb085f39f100d97ebb..4ef64a91ef71805efe031664ad17ffc0c91a414d 100644 (file)
--- a/src/script/lua_api/l_itemstackmeta.h
+++ b/src/script/lua_api/l_itemstackmeta.h
@@ -31,7 +31,7 @@ private:
        ItemStack *istack;
 
        static const char className[];
-       static const luaL_reg methods[];
+       static const luaL_Reg methods[];
 
        static ItemStackMetaRef *checkobject(lua_State *L, int narg);
 

diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
index 182894f4f72eb3cdd218fb6200a7b9bffa63cac3..c68602909e9ca0e70e6210194f19e922a8cfab41 100644 (file)
--- a/src/script/lua_api/l_minimap.cpp
+++ b/src/script/lua_api/l_minimap.cpp
@@ -201,7 +201,7 @@ void LuaMinimap::Register(lua_State *L)
 }
 
 const char LuaMinimap::className[] = "Minimap";
-const luaL_reg LuaMinimap::methods[] = {
+const luaL_Reg LuaMinimap::methods[] = {
        luamethod(LuaMinimap, show),
        luamethod(LuaMinimap, hide),
        luamethod(LuaMinimap, get_pos),

diff --git a/src/script/lua_api/l_minimap.h b/src/script/lua_api/l_minimap.h
index 9a299b4fd1def53e969fa2e0fb64f98e69889acc..8be72b8e7cf558d8fab99b75d009708b8cddd6a7 100644 (file)
--- a/src/script/lua_api/l_minimap.h
+++ b/src/script/lua_api/l_minimap.h
@@ -28,7 +28,7 @@ class LuaMinimap : 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 --git a/src/script/lua_api/l_nodemeta.cpp b/src/script/lua_api/l_nodemeta.cpp
index 4368a8c50ba3af2377019cef07945fcc1c98f836..55d11fc13354a986ee471bbf9364acd098ead6f0 100644 (file)
--- a/src/script/lua_api/l_nodemeta.cpp
+++ b/src/script/lua_api/l_nodemeta.cpp
@@ -215,7 +215,7 @@ void NodeMetaRef::Register(lua_State *L)
 }
 
 
-const luaL_reg NodeMetaRef::methodsServer[] = {
+const luaL_Reg NodeMetaRef::methodsServer[] = {
        luamethod(MetaDataRef, get_string),
        luamethod(MetaDataRef, set_string),
        luamethod(MetaDataRef, get_int),
@@ -237,7 +237,7 @@ void NodeMetaRef::RegisterClient(lua_State *L)
 }
 
 
-const luaL_reg NodeMetaRef::methodsClient[] = {
+const luaL_Reg NodeMetaRef::methodsClient[] = {
        luamethod(MetaDataRef, get_string),
        luamethod(MetaDataRef, get_int),
        luamethod(MetaDataRef, get_float),

diff --git a/src/script/lua_api/l_nodemeta.h b/src/script/lua_api/l_nodemeta.h
index 6d146416bd4e73aa050c48a37f4aa0a7f94ee89f..2ac028079aa62134aee8b27c6ede7a95dbdabc56 100644 (file)
--- a/src/script/lua_api/l_nodemeta.h
+++ b/src/script/lua_api/l_nodemeta.h
@@ -39,8 +39,8 @@ private:
        bool m_is_local;
 
        static const char className[];
-       static const luaL_reg methodsServer[];
-       static const luaL_reg methodsClient[];
+       static const luaL_Reg methodsServer[];
+       static const luaL_Reg methodsClient[];
 
        static NodeMetaRef *checkobject(lua_State *L, int narg);
 

diff --git a/src/script/lua_api/l_nodetimer.cpp b/src/script/lua_api/l_nodetimer.cpp
index ed11cc58e7c5b3b47d02e99bc3c059a6c325ce18..17b275c46293516ac453f31cc88b4d11971df5da 100644 (file)
--- a/src/script/lua_api/l_nodetimer.cpp
+++ b/src/script/lua_api/l_nodetimer.cpp
@@ -162,7 +162,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 --git a/src/script/lua_api/l_nodetimer.h b/src/script/lua_api/l_nodetimer.h
index 239112037c0c3abc61ca56212d8129dbe7c24b5f..ae362d8b3ed5397b1e38e896eec0032ec586bc1d 100644 (file)
--- a/src/script/lua_api/l_nodetimer.h
+++ b/src/script/lua_api/l_nodetimer.h
@@ -32,7 +32,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 --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp
index e0039371f0917aa9f4b3daa3ea87e97f6c1bb879..e3e76191f841adefef4693f7695a751a80fec007 100644 (file)
--- a/src/script/lua_api/l_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -135,7 +135,7 @@ void LuaPerlinNoise::Register(lua_State *L)
 
 
 const char LuaPerlinNoise::className[] = "PerlinNoise";
-const luaL_reg LuaPerlinNoise::methods[] = {
+const luaL_Reg LuaPerlinNoise::methods[] = {
        luamethod(LuaPerlinNoise, get2d),
        luamethod(LuaPerlinNoise, get3d),
        {0,0}
@@ -393,7 +393,7 @@ void LuaPerlinNoiseMap::Register(lua_State *L)
 
 
 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),
@@ -498,7 +498,7 @@ void LuaPseudoRandom::Register(lua_State *L)
 
 
 const char LuaPseudoRandom::className[] = "PseudoRandom";
-const luaL_reg LuaPseudoRandom::methods[] = {
+const luaL_Reg LuaPseudoRandom::methods[] = {
        luamethod(LuaPseudoRandom, next),
        {0,0}
 };
@@ -597,7 +597,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}
@@ -711,7 +711,7 @@ void LuaSecureRandom::Register(lua_State *L)
 }
 
 const char LuaSecureRandom::className[] = "SecureRandom";
-const luaL_reg LuaSecureRandom::methods[] = {
+const luaL_Reg LuaSecureRandom::methods[] = {
        luamethod(LuaSecureRandom, next_bytes),
        {0,0}
 };

diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h
index 11ec348bf61a5c3bbc61217e7076cab76dd2e934..f252b5ba2c32c0cb4aa4f113841b673c630cb998 100644 (file)
--- a/src/script/lua_api/l_noise.h
+++ b/src/script/lua_api/l_noise.h
@@ -32,7 +32,7 @@ class LuaPerlinNoise : public ModApiBase
 private:
        NoiseParams np;
        static const char className[];
-       static const luaL_reg methods[];
+       static const luaL_Reg methods[];
 
        // Exported functions
 
@@ -64,7 +64,7 @@ class LuaPerlinNoiseMap : public ModApiBase
        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
 
@@ -169,7 +169,7 @@ class LuaSecureRandom : public ModApiBase
 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 --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index d5681b809576f0fe4ab1f485e4e05228ffd54f45..f9d2754e77303d4cd0fd61e0722fe8d55905cd83 100644 (file)
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1823,7 +1823,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_aliased(ObjectRef, get_pos, getpos),

diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index 2c9aa559a87d43602f01a95c2b9128212d022bee..b6fc35bc29650f44ec074e3872725524e804dc91 100644 (file)
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -37,7 +37,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 --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp
index d3fe0300533b0b2b0a99420de3f1cab57e606182..809f7d11510a0d0250007cc92dc783bfeda2cdc9 100644 (file)
--- a/src/script/lua_api/l_settings.cpp
+++ b/src/script/lua_api/l_settings.cpp
@@ -214,7 +214,7 @@ LuaSettings* LuaSettings::checkobject(lua_State* L, int narg)
 }
 
 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 --git a/src/script/lua_api/l_settings.h b/src/script/lua_api/l_settings.h
index d5edd32ced2d0acfadd1afb14258e128f6eb97f9..b90f0a8f2289cb2118e0cbc5d7f1ab1fdb01b092 100644 (file)
--- a/src/script/lua_api/l_settings.h
+++ b/src/script/lua_api/l_settings.h
@@ -28,7 +28,7 @@ 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 --git a/src/script/lua_api/l_storage.cpp b/src/script/lua_api/l_storage.cpp
index 867ab9c8d0850e990437266a9ab9b7c72346e158..59906dda5804b3c6d575ba1bd6b31220ba9b8b1f 100644 (file)
--- a/src/script/lua_api/l_storage.cpp
+++ b/src/script/lua_api/l_storage.cpp
@@ -129,7 +129,7 @@ void StorageRef::clearMeta()
 }
 
 const char StorageRef::className[] = "StorageRef";
-const luaL_reg StorageRef::methods[] = {
+const luaL_Reg StorageRef::methods[] = {
        luamethod(MetaDataRef, get_string),
        luamethod(MetaDataRef, set_string),
        luamethod(MetaDataRef, get_int),

diff --git a/src/script/lua_api/l_storage.h b/src/script/lua_api/l_storage.h
index e09b8b39144d2df2f81c3a77a6dc1591564bc1cf..ec6f8d94174a1a3a56fa8c5277b27463eb94d56b 100644 (file)
--- a/src/script/lua_api/l_storage.h
+++ b/src/script/lua_api/l_storage.h
@@ -41,7 +41,7 @@ private:
        ModMetadata *m_object;
 
        static const char className[];
-       static const luaL_reg methods[];
+       static const luaL_Reg methods[];
 
        virtual Metadata *getmeta(bool auto_create);
        virtual void clearMeta();

diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index 5f129d2afd7d0bc8ea79f88318f8c9ec75829f8b..7316fb200e6f078f1aa6f1ec0addd0be3dcb5743 100644 (file)
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -452,7 +452,7 @@ void LuaVoxelManip::Register(lua_State *L)
 }
 
 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 --git a/src/script/lua_api/l_vmanip.h b/src/script/lua_api/l_vmanip.h
index 65fc0d97ada8aaa724e558b0553001d10f4a570c..b6a69f36a4ef80a9f580da65da4fa3d7c653243a 100644 (file)
--- a/src/script/lua_api/l_vmanip.h
+++ b/src/script/lua_api/l_vmanip.h
@@ -38,7 +38,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);