2 files changed, 25 insertions, 3 deletions

diff --git a/c-api/compat-5.3.c b/c-api/compat-5.3.c
index 9d63b5d..bd9e277 100644
--- a/c-api/compat-5.3.c
+++ b/c-api/compat-5.3.c
@@ -184,11 +184,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 af08b6a..c62d6bf 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -9,11 +9,13 @@ extern "C" {
 #endif
 #include <lua.h>
 #include <lauxlib.h>
+#include <lualib.h>
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 }
 #endif
 
 
+#undef COMPAT53_INCLUDE_SOURCE
 #if defined(COMPAT53_PREFIX)
 /* - change the symbol names of functions to avoid linker conflicts
  * - compat-5.3.c needs to be compiled (and linked) separately
@@ -21,7 +23,6 @@ extern "C" {
 #  if !defined(COMPAT53_API)
 #    define COMPAT53_API extern
 #  endif
-#  undef COMPAT53_INCLUDE_SOURCE
 #else /* COMPAT53_PREFIX */
 /* - make all functions static and include the source.
  * - compat-5.3.c doesn't need to be compiled (and linked) separately
@@ -86,6 +87,19 @@ extern "C" {
 #  define LUA_OPLE 2
 #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 {
@@ -97,6 +111,14 @@ typedef struct luaL_Buffer_53 {
 } luaL_Buffer_53;
 #define luaL_Buffer luaL_Buffer_53
 
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+ * In LuaJIT, it's a struct where the first member is a FILE*
+ * We can't support the `closef` member
+ */
+typedef struct luaL_Stream {
+  FILE *f;
+} luaL_Stream;
+
 #define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
 COMPAT53_API int lua_absindex (lua_State *L, int i);