forked from Mirrorlandia_minetest/minetest
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
This commit is contained in:
parent
01f9d05f23
commit
41c5483024
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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),
|
||||
|
@ -28,7 +28,7 @@ private:
|
||||
ItemStack m_stack;
|
||||
|
||||
static const char className[];
|
||||
static const luaL_reg methods[];
|
||||
static const luaL_Reg methods[];
|
||||
|
||||
// Exported functions
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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}
|
||||
};
|
||||
|
@ -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];
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
@ -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),
|
||||
|
@ -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();
|
||||
|
@ -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),
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user