Merge branch 'master' into v2.1

2018-01-29 12:53:42 +01:00
parent 8071aa4ad6 b03a56f28e
commit 74c544d68c
3 changed files with 11 additions and 2 deletions
--- a/src/lj_carith.h
+++ b/src/lj_carith.h
@@ -11,6 +11,7 @@
 #if LJ_HASFFI

 LJ_FUNC int lj_carith_op(lua_State *L, MMS mm);
+LJ_FUNC int lj_carith_len(lua_State *L);

 #if LJ_32
 LJ_FUNC uint64_t lj_carith_shl64(uint64_t x, int32_t sh);