1From 8d1b5a9b973a9891d676dabf31807eb825d7f262 Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= <francois.perrad@gadz.org> 3Date: Wed, 6 Sep 2017 00:00:56 +0200 4Subject: [PATCH] Do not load coxpcall for LuaJIT 5 6* coxpcall is only required with PUC Lua 5.1, but not with LuaJIT 7 8use the same logic as in copas.lua. 9this fixes issue #63. 10 11Fetch from: https://github.com/keplerproject/copas/commit/8d1b5a9b973a9891d676dabf31807eb825d7f262 12Signed-off-by: Francois Perrad <francois.perrad@gadz.org> 13--- 14 doc/us/index.html | 5 +++++ 15 src/copas/limit.lua | 2 +- 16 2 files changed, 6 insertions(+), 1 deletion(-) 17 18diff --git a/copas-2_0_2/doc/us/index.html b/doc/us/index.html 19index 1d008c2..c4d85ef 100644 20--- a/copas-2_0_2/doc/us/index.html 21+++ b/copas-2_0_2/doc/us/index.html 22@@ -114,6 +114,11 @@ LuaSocket, <a href="http://keplerproject.github.io/coxpcall/">Coxpcall</a> (only 23 <h2><a name="history"></a>History</h2> 24 25 <dl class="history"> 26+ <dt><strong>Copas</strong> [unreleased]</dt> 27+ <dd><ul> 28+ <li>Fixed: coxpcall dependency in limit.lua #63 (Francois Perrad)</li> 29+ </ul></dd> 30+ 31 <dt><strong>Copas 2.0.2</strong> [2017]</dt> 32 <dd><ul> 33 <li>Added: <code>copas.running</code> flag</li> 34diff --git a/copas-2_0_2/src/copas/limit.lua b/src/copas/limit.lua 35index ea178be..f0dfe17 100644 36--- a/copas-2_0_2/src/copas/limit.lua 37+++ b/copas-2_0_2/src/copas/limit.lua 38@@ -10,7 +10,7 @@ local pack = table.pack or function(...) return {n=select('#',...),...} end 39 local unpack = function(t) return (table.unpack or unpack)(t, 1, t.n or #t) end 40 41 local pcall = pcall 42-if _VERSION=="Lua 5.1" then -- obsolete: only for Lua 5.1 compatibility 43+if _VERSION=="Lua 5.1" and not jit then -- obsolete: only for Lua 5.1 compatibility 44 pcall = require("coxpcall").pcall 45 end 46 47-- 482.17.1 49 50