diff options
| author | Mike Pall <mike> | 2024-02-04 16:47:14 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2024-02-04 16:47:14 +0100 |
| commit | 0d313b243194a0b8d2399d8b549ca5a0ff234db5 (patch) | |
| tree | e483bc17d481f168e47da7042d46b7a66a1cf79c /src/lj_err.h | |
| parent | 9cc2e42b17148036d7d9ef36ab7afe52df345163 (diff) | |
| parent | defe61a56751a0db5f00ff3ab7b8f45436ba74c8 (diff) | |
| download | luajit-0d313b243194a0b8d2399d8b549ca5a0ff234db5.tar.gz luajit-0d313b243194a0b8d2399d8b549ca5a0ff234db5.tar.bz2 luajit-0d313b243194a0b8d2399d8b549ca5a0ff234db5.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_err.h')
| -rw-r--r-- | src/lj_err.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_err.h b/src/lj_err.h index 8768fefd..67686cb7 100644 --- a/src/lj_err.h +++ b/src/lj_err.h | |||
| @@ -23,6 +23,7 @@ LJ_DATA const char *lj_err_allmsg; | |||
| 23 | LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em); | 23 | LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em); |
| 24 | LJ_FUNCA_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode); | 24 | LJ_FUNCA_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode); |
| 25 | LJ_FUNC_NORET void lj_err_mem(lua_State *L); | 25 | LJ_FUNC_NORET void lj_err_mem(lua_State *L); |
| 26 | LJ_FUNC_NORET void LJ_FASTCALL lj_err_stkov(lua_State *L); | ||
| 26 | LJ_FUNC_NORET void LJ_FASTCALL lj_err_run(lua_State *L); | 27 | LJ_FUNC_NORET void LJ_FASTCALL lj_err_run(lua_State *L); |
| 27 | #if LJ_HASJIT | 28 | #if LJ_HASJIT |
| 28 | LJ_FUNCA_NORET void LJ_FASTCALL lj_err_trace(lua_State *L, int errcode); | 29 | LJ_FUNCA_NORET void LJ_FASTCALL lj_err_trace(lua_State *L, int errcode); |