Merge branch 'master' into v2.1

2020-05-08 14:00:07 +02:00
parent 92c011b511 cc4bbec483
commit d5e12d5174
4 changed files with 6 additions and 14 deletions
--- a/src/lj_carith.h
+++ b/src/lj_carith.h
@@ -11,7 +11,6 @@
 #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);