gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2024-01-31 14:31:40 +01:00
commit 5e5d542c99
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/host/genversion.lua
View File

@ -29,7 +29,7 @@ local function file_write_mod(file, data)
assert(fp:close()) assert(fp:close())
end end
local text = file_read(FILE_ROLLING_H) local text = file_read(FILE_ROLLING_H):gsub("#error.-\n", "")
local relver = file_read(FILE_RELVER_TXT):match("(%d+)") local relver = file_read(FILE_RELVER_TXT):match("(%d+)")
if relver then if relver then

1
src/luajit_rolling.h
View File

@ -76,4 +76,5 @@ LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
/* Enforce (dynamic) linker error for version mismatches. Call from main. */ /* Enforce (dynamic) linker error for version mismatches. Call from main. */
LUA_API void LUAJIT_VERSION_SYM(void); LUA_API void LUAJIT_VERSION_SYM(void);
#error "DO NOT USE luajit_rolling.h -- only include build-generated luajit.h"
#endif #endif