diff options
author | Benoit Germain <bnt period germain arrobase gmail period com> | 2017-05-10 17:10:29 +0200 |
---|---|---|
committer | Benoit Germain <bnt period germain arrobase gmail period com> | 2017-05-10 17:10:29 +0200 |
commit | e5f454b3cee91f79f4f107b68a4708addc0a914a (patch) | |
tree | e8d3c53937659b2f615870b9294a0d5e0dfa7a30 /src/tools.h | |
parent | 0a064da8d02d0863463583e4f693462ef7725c2f (diff) | |
download | lanes-e5f454b3cee91f79f4f107b68a4708addc0a914a.tar.gz lanes-e5f454b3cee91f79f4f107b68a4708addc0a914a.tar.bz2 lanes-e5f454b3cee91f79f4f107b68a4708addc0a914a.zip |
Improve LuaJIT support
* better LuaJIT-specific headers detection
* add LuaJIT-specific libraries when known
* properly raise an error when attempting to transfer a LUAT_CDATA value
* some compilationg warning fixes
Diffstat (limited to 'src/tools.h')
-rw-r--r-- | src/tools.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools.h b/src/tools.h index a4bcf43..b869a16 100644 --- a/src/tools.h +++ b/src/tools.h | |||
@@ -17,9 +17,11 @@ | |||
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | // For some reason, LuaJIT 64bits doesn't support lua_newstate() | 19 | // For some reason, LuaJIT 64bits doesn't support lua_newstate() |
20 | #if defined(LUA_LJDIR) && (defined(__x86_64__) || defined(_M_X64)) | 20 | #if defined(LUA_JITLIBNAME) && (defined(__x86_64__) || defined(_M_X64)) |
21 | //#pragma message( "LuaJIT 64 bits detected: don't propagate allocf") | ||
21 | #define PROPAGATE_ALLOCF 0 | 22 | #define PROPAGATE_ALLOCF 0 |
22 | #else // LuaJIT x64 | 23 | #else // LuaJIT x64 |
24 | //#pragma message( "PUC-Lua detected: propagate allocf") | ||
23 | #define PROPAGATE_ALLOCF 1 | 25 | #define PROPAGATE_ALLOCF 1 |
24 | #endif // LuaJIT x64 | 26 | #endif // LuaJIT x64 |
25 | #if PROPAGATE_ALLOCF | 27 | #if PROPAGATE_ALLOCF |