2 files changed, 18 insertions, 2 deletions

diff --git a/c-api/compat-5.3.c b/c-api/compat-5.3.c
index fab89c0..811f248 100644
--- a/c-api/compat-5.3.c
+++ b/c-api/compat-5.3.c
@@ -101,11 +101,11 @@ COMPAT53_API void lua_copy (lua_State *L, int from, int to) {
 COMPAT53_API void lua_len (lua_State *L, int i) {
   switch (lua_type(L, i)) {
     case LUA_TSTRING:
-      lua_pushnumber(L, (lua_Integer)lua_objlen(L, i));
+      lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
       break;
     case LUA_TTABLE:
       if (!luaL_callmeta(L, i, "__len"))
-        lua_pushnumber(L, (lua_Integer)lua_objlen(L, i));
+        lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
       break;
     case LUA_TUSERDATA:
       if (luaL_callmeta(L, i, "__len"))
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index 02712f3..a5b10d2 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -91,6 +91,19 @@ extern "C" {
 #  define LUA_FILEHANDLE "FILE*"
 #endif
 
+/* LuaJIT/Lua 5.1 does not have the updated 
+ * error codes for thread status/function returns (but some patched versions do)
+ * define it only if it's not found
+ */
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1) 
+ * LUA_ERRFILE is defined as (LUA_ERRERR+1)
+ * so we need to avoid it (LuaJIT might have something at this
+ * integer value too)
+ */
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
 typedef size_t lua_Unsigned;
 
 typedef struct luaL_Buffer_53 {
@@ -198,6 +211,9 @@ COMPAT53_API int luaL_execresult (lua_State *L, int stat);
 #define lua_pcallk(L, na, nr, err, ctx, cont) \
   ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
 
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
 #define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
 COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B);