diff options
| author | Mike Pall <mike> | 2018-01-29 12:53:42 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2018-01-29 12:53:42 +0100 |
| commit | 74c544d68c07bcd416225598cdf15f88e62fd457 (patch) | |
| tree | e180bc5a5b92a3eba053b9484ffb97c308da949a /src/lj_carith.h | |
| parent | 8071aa4ad65cf09e3b7adda4a7787d8897e5314c (diff) | |
| parent | b03a56f28ec360bbcf43091afd0607890a4a33c7 (diff) | |
| download | luajit-74c544d68c07bcd416225598cdf15f88e62fd457.tar.gz luajit-74c544d68c07bcd416225598cdf15f88e62fd457.tar.bz2 luajit-74c544d68c07bcd416225598cdf15f88e62fd457.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, 1 insertions, 0 deletions
diff --git a/src/lj_carith.h b/src/lj_carith.h index 67d976bf..3b0a5dd7 100644 --- a/src/lj_carith.h +++ b/src/lj_carith.h | |||
| @@ -11,6 +11,7 @@ | |||
| 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); | ||
| 14 | 15 | ||
| 15 | #if LJ_32 | 16 | #if LJ_32 |
| 16 | LJ_FUNC uint64_t lj_carith_shl64(uint64_t x, int32_t sh); | 17 | LJ_FUNC uint64_t lj_carith_shl64(uint64_t x, int32_t sh); |