diff options
| author | Mike Pall <mike> | 2013-10-24 15:21:44 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-10-24 15:21:44 +0200 |
| commit | d8f05356ca271a1168f5eacc2daaf40dbae23323 (patch) | |
| tree | db74d4dc426a0c2114886f3713b1953dfa47c4d5 /src/lj_errmsg.h | |
| parent | a014d5e65d654a49936971ad0b4c4bb495883240 (diff) | |
| parent | 7e538b5f0ae1dfa7667f3a974d570f0cd8190aca (diff) | |
| download | luajit-d8f05356ca271a1168f5eacc2daaf40dbae23323.tar.gz luajit-d8f05356ca271a1168f5eacc2daaf40dbae23323.tar.bz2 luajit-d8f05356ca271a1168f5eacc2daaf40dbae23323.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_errmsg.h')
| -rw-r--r-- | src/lj_errmsg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_errmsg.h b/src/lj_errmsg.h index e62dc237..8f01fdc7 100644 --- a/src/lj_errmsg.h +++ b/src/lj_errmsg.h | |||
| @@ -100,6 +100,7 @@ ERRDEF(STRFMT, "invalid option " LUA_QS " to " LUA_QL("format")) | |||
| 100 | ERRDEF(STRGSRV, "invalid replacement value (a %s)") | 100 | ERRDEF(STRGSRV, "invalid replacement value (a %s)") |
| 101 | ERRDEF(BADMODN, "name conflict for module " LUA_QS) | 101 | ERRDEF(BADMODN, "name conflict for module " LUA_QS) |
| 102 | #if LJ_HASJIT | 102 | #if LJ_HASJIT |
| 103 | ERRDEF(JITPROT, "runtime code generation failed, restricted kernel?") | ||
| 103 | #if LJ_TARGET_X86ORX64 | 104 | #if LJ_TARGET_X86ORX64 |
| 104 | ERRDEF(NOJIT, "JIT compiler disabled, CPU does not support SSE2") | 105 | ERRDEF(NOJIT, "JIT compiler disabled, CPU does not support SSE2") |
| 105 | #else | 106 | #else |