aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-18 14:57:04 +0100
committerKim Alvefur <zash@zash.se>2016-02-18 14:57:04 +0100
commitbad300a675f079ccf45da6cbaf07e55be7ed85f0 (patch)
treed4b877f0a532c9a5ad989a4ca42cb05ad1ccf1aa /core
parent68d19b7be1bb696a565539a87d1149fd5de0bd20 (diff)
downloadprosody-bad300a675f079ccf45da6cbaf07e55be7ed85f0.tar.gz
prosody-bad300a675f079ccf45da6cbaf07e55be7ed85f0.zip
loggingmanager,modulemanager,moduleapi: Localize unpack compatible with Lua 5.2+
Diffstat (limited to 'core')
-rw-r--r--core/moduleapi.lua3
-rw-r--r--core/modulemanager.lua3
2 files changed, 4 insertions, 2 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 573f3153..9a0c5223 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -19,7 +19,8 @@ local st = require "util.stanza";
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
local error, setmetatable, type = error, setmetatable, type;
-local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
+local ipairs, pairs, select = ipairs, pairs, select;
+local unpack = table.unpack or unpack;
local tonumber, tostring = tonumber, tostring;
local require = require;
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 41c9b2fe..5d030513 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -23,7 +23,8 @@ local setmetatable, rawget = setmetatable, rawget;
local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
local debug_traceback = debug.traceback;
-local unpack, select = unpack, select;
+local select = select;
+local unpack = table.unpack or unpack;
local pcall = function(f, ...)
local n = select("#", ...);
local params = {...};