aboutsummaryrefslogtreecommitdiffstats
path: root/util/dependencies.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
committerKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
commit908f5b61c55e4cba39e61ac415b0fca384a1095d (patch)
tree6e391ff6608608f181e42c92ee6dfd7c534da255 /util/dependencies.lua
parentc4c38d2f01d5f2711b527c7c2412250ed6c58738 (diff)
parentfd9ccf20d5b652dbad1f37cecd540661f4642ee6 (diff)
downloadprosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.tar.gz
prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.zip
Merge 0.11->trunk
Diffstat (limited to 'util/dependencies.lua')
-rw-r--r--util/dependencies.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 7c7b938e..22b66d7c 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -90,7 +90,7 @@ local function check_dependencies()
}, "SSL/TLS support will not be available");
end
- local bit = _G.bit32 or softreq"bit";
+ local bit = softreq"util.bitcompat";
if not bit then
missingdep("lua-bitops", {
@@ -140,7 +140,7 @@ local function check_dependencies()
end
local function log_warnings()
- if _VERSION > "Lua 5.2" then
+ if _VERSION > "Lua 5.3" then
prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
end
local ssl = softreq"ssl";