1 files changed, 10 insertions, 11 deletions

diff --git a/llimits.h b/llimits.h
index 52a32f92..246dca8b 100644
--- a/llimits.h
+++ b/llimits.h
@@ -16,21 +16,25 @@
 
 
 /*
-** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count
-** the total memory used by Lua (in bytes). Usually, 'size_t' and
+** 'lu_mem' is an unsigned integer big enough to count the total memory
+** used by Lua (in bytes). 'l_obj' is a signed integer big enough to
+** count the total number of objects used by Lua. (It is signed due
+** to the use of debt in several computations.)  Usually, 'size_t' and
 ** 'ptrdiff_t' should work, but we use 'long' for 16-bit machines.
 */
 #if defined(LUAI_MEM)           /* { external definitions? */
 typedef LUAI_UMEM lu_mem;
-typedef LUAI_MEM l_mem;
+typedef LUAI_MEM l_obj;
 #elif LUAI_IS32INT      /* }{ */
 typedef size_t lu_mem;
-typedef ptrdiff_t l_mem;
+typedef ptrdiff_t l_obj;
 #else  /* 16-bit ints */        /* }{ */
 typedef unsigned long lu_mem;
-typedef long l_mem;
+typedef long l_obj;
 #endif                          /* } */
 
+#define MAX_LOBJ        cast(l_obj, ~cast(lu_mem, 0) >> 1)
+
 
 /* chars used as small naturals (so that 'char' is reserved for characters) */
 typedef unsigned char lu_byte;
@@ -45,11 +49,6 @@ typedef signed char ls_byte;
                           : (size_t)(LUA_MAXINTEGER))
 
 
-#define MAX_LUMEM       ((lu_mem)(~(lu_mem)0))
-
-#define MAX_LMEM        ((l_mem)(MAX_LUMEM >> 1))
-
-
 #define MAX_INT         INT_MAX  /* maximum value of an int */
 
 
@@ -57,7 +56,7 @@ typedef signed char ls_byte;
 ** floor of the log2 of the maximum signed value for integral type 't'.
 ** (That is, maximum 'n' such that '2^n' fits in the given signed type.)
 */
-#define log2maxs(t)     (sizeof(t) * 8 - 2)
+#define log2maxs(t)     cast_int(sizeof(t) * 8 - 2)
 
 
 /*