5 files changed, 25 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index b5ad5df..77c34b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 CHANGES:
+CHANGE 158: BGe 22-Feb-24
+   * naive luajit detection in PUC-Lua-based builds to detect mismatches (don't run )
+   * internal version bumped to 3.16.3
 CHANGE 157: Mitalie 17-Aug-23
   * Prevent crash on linux as non-root
   * internal version bumped to 3.16.2
diff --git a/docs/index.html b/docs/index.html
index bca8340..3fd77dc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -70,7 +70,7 @@
                        </p>
                        <p>
-                                This document was revised on 17-Aug-23, and applies to version <tt>3.16.2</tt>.
+                                This document was revised on 22-Feb-24, and applies to version <tt>3.16.3</tt>.
                        </p>
                </font>
        </center>
diff --git a/lanes-3.16.2-0.rockspec b/lanes-3.16.3-0.rockspec
index 5c4e437..e223a19 100644
--- a/lanes-3.16.2-0.rockspec
+++ b/lanes-3.16.3-0.rockspec
@@ -7,11 +7,11 @@
 package = "Lanes"
-version = "3.16.2-0"
+version = "3.16.3-0"
 source= {
        url= "git+https://github.com/LuaLanes/lanes.git",
-        branch= "v3.16.2"
+        branch= "v3.16.3"
 }
 description = {
@@ -36,7 +36,7 @@ supported_platforms= { "win32",
 }
 dependencies= {
-        "lua >= 5.1", -- builds with either 5.1, 5.2, 5.3 and 5.4
+        "lua >= 5.1", -- builds with either 5.1/LuaJIT, 5.2, 5.3 and 5.4
 }
 build = {
diff --git a/src/lanes.c b/src/lanes.c
index d2c95ee..332a1b8 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -2083,6 +2083,17 @@ int LANES_API luaopen_lanes_core( lua_State* L)
    STACK_GROW( L, 4);
    STACK_CHECK( L, 0);
+    // Prevent PUC-Lua/LuaJIT mismatch. Hopefully this works for MoonJIT too
+    lua_getglobal( L, "jit");                           // {jit?}
+#if LUAJIT_FLAVOR() == 0
+    if (!lua_isnil( L, -1))
+        return luaL_error( L, "Lanes is built for PUC-Lua, don't run from LuaJIT");
+#else
+    if (lua_isnil( L, -1))
+        return luaL_error( L, "Lanes is built for LuaJIT, don't run from PUC-Lua");
+#endif
+    lua_pop( L, 1);                                     //
    // Create main module interface table
    // we only have 1 closure, which must be called to configure Lanes
    lua_newtable( L);                                   // M
@@ -2092,15 +2103,15 @@ int LANES_API luaopen_lanes_core( lua_State* L)
    REGISTRY_GET( L, CONFIG_REGKEY);                    // M LG_configure() settings
    if( !lua_isnil( L, -1)) // this is not the first require "lanes.core": call configure() immediately
    {
-        lua_pushvalue( L, -1);                            // M LG_configure() settings settings
+        lua_pushvalue( L, -1);                          // M LG_configure() settings settings
-        lua_setfield( L, -4, "settings");                 // M LG_configure() settings
+        lua_setfield( L, -4, "settings");               // M LG_configure() settings
-        lua_call( L, 1, 0);                               // M
+        lua_call( L, 1, 0);                             // M
    }
    else
    {
        // will do nothing on first invocation, as we haven't stored settings in the registry yet
-        lua_setfield( L, -3, "settings");                 // M LG_configure()
+        lua_setfield( L, -3, "settings");               // M LG_configure()
-        lua_setfield( L, -2, "configure");                // M
+        lua_setfield( L, -2, "configure");              // M
    }
    STACK_END( L, 1);
diff --git a/src/lanes.h b/src/lanes.h
index b9245f3..7e1a2e5 100644
--- a/src/lanes.h
+++ b/src/lanes.h
@@ -12,7 +12,7 @@
 #define LANES_VERSION_MAJOR 3
 #define LANES_VERSION_MINOR 16
-#define LANES_VERSION_PATCH 2
+#define LANES_VERSION_PATCH 3
 #define LANES_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH)     ((LANES_VERSION_MAJOR>MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR>MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH>=PATCH))))
 #define LANES_VERSION_LESS_THAN(MAJOR, MINOR, PATCH)        ((LANES_VERSION_MAJOR<MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR<MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH<PATCH))))