diff options
| author | Mike Pall <mike> | 2020-05-08 14:00:07 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-05-08 14:00:07 +0200 |
| commit | d5e12d5174720fbd3c5fad4e02da5850b8433057 (patch) | |
| tree | e6f53754f6086ed254cf2a8d0fcfbeee679696f1 /src/lj_carith.h | |
| parent | 92c011b5117f237f2554c5745646ea566ce0d568 (diff) | |
| parent | cc4bbec483d3f3250b519ccb7cc22f1a8e6fe6f0 (diff) | |
| download | luajit-d5e12d5174720fbd3c5fad4e02da5850b8433057.tar.gz luajit-d5e12d5174720fbd3c5fad4e02da5850b8433057.tar.bz2 luajit-d5e12d5174720fbd3c5fad4e02da5850b8433057.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_carith.h')
| -rw-r--r-- | src/lj_carith.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lj_carith.h b/src/lj_carith.h index af6225ae..788718d9 100644 --- a/src/lj_carith.h +++ b/src/lj_carith.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #if LJ_HASFFI | 11 | #if LJ_HASFFI |
| 12 | 12 | ||
| 13 | LJ_FUNC int lj_carith_op(lua_State *L, MMS mm); | 13 | LJ_FUNC int lj_carith_op(lua_State *L, MMS mm); |
| 14 | LJ_FUNC int lj_carith_len(lua_State *L); | ||
| 15 | 14 | ||
| 16 | #if LJ_32 | 15 | #if LJ_32 |
| 17 | LJ_FUNC uint64_t lj_carith_shl64(uint64_t x, int32_t sh); | 16 | LJ_FUNC uint64_t lj_carith_shl64(uint64_t x, int32_t sh); |