diff options
| author | Mike Pall <mike> | 2015-08-20 00:51:32 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-08-20 00:51:32 +0200 |
| commit | b86fc2b36a394c7d093b9ca053a50ad060388b44 (patch) | |
| tree | f46b656b451116737fb918051734dc4bd4e519fb /src | |
| parent | eb050f9e2abc7432b17059f900c70bf7ce5575c9 (diff) | |
| parent | 424940ffc3fbc0b158cb95875a70accd49c04d30 (diff) | |
| download | luajit-b86fc2b36a394c7d093b9ca053a50ad060388b44.tar.gz luajit-b86fc2b36a394c7d093b9ca053a50ad060388b44.tar.bz2 luajit-b86fc2b36a394c7d093b9ca053a50ad060388b44.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_traceerr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_traceerr.h b/src/lj_traceerr.h index 0f38562b..12e90d03 100644 --- a/src/lj_traceerr.h +++ b/src/lj_traceerr.h | |||
| @@ -25,7 +25,7 @@ TREDEF(BADTYPE, "bad argument type") | |||
| 25 | TREDEF(CJITOFF, "JIT compilation disabled for function") | 25 | TREDEF(CJITOFF, "JIT compilation disabled for function") |
| 26 | TREDEF(CUNROLL, "call unroll limit reached") | 26 | TREDEF(CUNROLL, "call unroll limit reached") |
| 27 | TREDEF(DOWNREC, "down-recursion, restarting") | 27 | TREDEF(DOWNREC, "down-recursion, restarting") |
| 28 | TREDEF(NYICF, "NYI: C function %p") | 28 | TREDEF(NYICF, "NYI: C function %s") |
| 29 | TREDEF(NYIFF, "NYI: FastFunc %s") | 29 | TREDEF(NYIFF, "NYI: FastFunc %s") |
| 30 | TREDEF(NYIFFU, "NYI: unsupported variant of FastFunc %s") | 30 | TREDEF(NYIFFU, "NYI: unsupported variant of FastFunc %s") |
| 31 | TREDEF(NYIRETL, "NYI: return to lower frame") | 31 | TREDEF(NYIRETL, "NYI: return to lower frame") |