Merge branch 'master' into v2.1

2 files changed, 2 insertions, 1 deletions

diff --git a/src/host/genversion.lua b/src/host/genversion.lua
index 28f7206c..f0925160 100644
--- a/src/host/genversion.lua
+++ b/src/host/genversion.lua
@@ -29,7 +29,7 @@ local function file_write_mod(file, data)
   assert(fp:close())
 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+)")
 
 if relver then
diff --git a/src/luajit_rolling.h b/src/luajit_rolling.h
index e564477a..2d04402c 100644
--- a/src/luajit_rolling.h
+++ b/src/luajit_rolling.h
@@ -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. */
 LUA_API void LUAJIT_VERSION_SYM(void);
 
+#error "DO NOT USE luajit_rolling.h -- only include build-generated luajit.h"
 #endif