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/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -194,7 +194,7 @@ LJLIB_CF(ffi_meta___eq)		LJLIB_REC(cdata_arith MM_eq)

 LJLIB_CF(ffi_meta___len)	LJLIB_REC(cdata_arith MM_len)
 {
-  return ffi_arith(L);
+  return lj_carith_len(L);
 }

 LJLIB_CF(ffi_meta___lt)		LJLIB_REC(cdata_arith MM_lt)