diff options
| author | Benoit Germain <b n t DOT g e r m a i n AT g m a i l DOT c o m> | 2018-11-02 16:11:23 +0100 |
|---|---|---|
| committer | Benoit Germain <b n t DOT g e r m a i n AT g m a i l DOT c o m> | 2018-11-02 16:11:23 +0100 |
| commit | 94c794c8e06a848868509927eefde0741cd8bbe6 (patch) | |
| tree | abae1e9532464e2ff0c31492d8e7d9d3b31d2de2 /src | |
| parent | 846322e52afdad04c92c90c8d43ecc19e46a2b9e (diff) | |
| download | lanes-94c794c8e06a848868509927eefde0741cd8bbe6.tar.gz lanes-94c794c8e06a848868509927eefde0741cd8bbe6.tar.bz2 lanes-94c794c8e06a848868509927eefde0741cd8bbe6.zip | |
Fix error with LuaJIT when ffi package isn't required
Diffstat (limited to 'src')
| -rw-r--r-- | src/lanes.c | 2 | ||||
| -rw-r--r-- | src/lanes.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lanes.c b/src/lanes.c index b89e3f5..f2e7927 100644 --- a/src/lanes.c +++ b/src/lanes.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | * ... | 52 | * ... |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | char const* VERSION = "3.12"; | 55 | char const* VERSION = "3.13"; |
| 56 | 56 | ||
| 57 | /* | 57 | /* |
| 58 | =============================================================================== | 58 | =============================================================================== |
diff --git a/src/lanes.lua b/src/lanes.lua index 54fa0ac..b82ae2a 100644 --- a/src/lanes.lua +++ b/src/lanes.lua | |||
| @@ -77,7 +77,7 @@ lanes.configure = function( settings_) | |||
| 77 | demote_full_userdata = nil, | 77 | demote_full_userdata = nil, |
| 78 | verbose_errors = false, | 78 | verbose_errors = false, |
| 79 | -- LuaJIT provides a thread-unsafe allocator by default, so we need to protect it when used in parallel lanes | 79 | -- LuaJIT provides a thread-unsafe allocator by default, so we need to protect it when used in parallel lanes |
| 80 | protect_allocator = (package.loaded.jit and jit.version and (package.loaded.ffi.abi( "32bit") or package.loaded.ffi.abi( "gc64"))) and true or false | 80 | protect_allocator = (package.loaded.jit and jit.version and package.loaded.ffi and (package.loaded.ffi.abi( "32bit") or package.loaded.ffi.abi( "gc64"))) and true or false |
| 81 | } | 81 | } |
| 82 | local boolean_param_checker = function( val_) | 82 | local boolean_param_checker = function( val_) |
| 83 | -- non-'boolean-false' should be 'boolean-true' or nil | 83 | -- non-'boolean-false' should be 'boolean-true' or nil |