diff options
| author | Mike Pall <mike> | 2020-08-09 23:12:48 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-08-09 23:12:48 +0200 |
| commit | 94d4abcca966df2cc423e821bcacd04898f73117 (patch) | |
| tree | 4ae1ee5d806e445b56747436a2562beb94ac2032 /src/lj_err.h | |
| parent | 46a6d06dc57a52da9d0f295914094ee7d89b4a9c (diff) | |
| parent | e296f56b825c688c3530a981dc6b495d972f3d01 (diff) | |
| download | luajit-94d4abcca966df2cc423e821bcacd04898f73117.tar.gz luajit-94d4abcca966df2cc423e821bcacd04898f73117.tar.bz2 luajit-94d4abcca966df2cc423e821bcacd04898f73117.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_err.h')
| -rw-r--r-- | src/lj_err.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_err.h b/src/lj_err.h index ed148d79..4ae637d4 100644 --- a/src/lj_err.h +++ b/src/lj_err.h | |||
| @@ -23,7 +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_err_run(lua_State *L); | 26 | LJ_FUNCA_NORET void LJ_FASTCALL lj_err_run(lua_State *L); |
| 27 | LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em); | 27 | LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em); |
| 28 | LJ_FUNC_NORET void lj_err_lex(lua_State *L, GCstr *src, const char *tok, | 28 | LJ_FUNC_NORET void lj_err_lex(lua_State *L, GCstr *src, const char *tok, |
| 29 | BCLine line, ErrMsg em, va_list argp); | 29 | BCLine line, ErrMsg em, va_list argp); |