aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lmem.h5
-rw-r--r--lvm.c4
-rw-r--r--lvm.h8
3 files changed, 10 insertions, 7 deletions
diff --git a/lmem.h b/lmem.h
index 46388f0a..2ddde353 100644
--- a/lmem.h
+++ b/lmem.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lmem.h,v 1.31 2005/04/25 19:24:10 roberto Exp roberto $ 2** $Id: lmem.h,v 1.32 2006/09/14 18:42:28 roberto Exp roberto $
3** Interface to Memory Manager 3** Interface to Memory Manager
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -37,10 +37,11 @@
37#define luaM_reallocvector(L, v,oldn,n,t) \ 37#define luaM_reallocvector(L, v,oldn,n,t) \
38 ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) 38 ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
39 39
40LUAI_FUNC void *luaM_toobig (lua_State *L);
40 41
42/* not to be called directly */
41LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, 43LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
42 size_t size); 44 size_t size);
43LUAI_FUNC void *luaM_toobig (lua_State *L);
44LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, 45LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
45 size_t size_elem, int limit, 46 size_t size_elem, int limit,
46 const char *what); 47 const char *what);
diff --git a/lvm.c b/lvm.c
index f15f7688..d0fa8c87 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.68 2006/09/19 13:57:50 roberto Exp roberto $ 2** $Id: lvm.c,v 2.69 2006/09/19 14:06:45 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -247,7 +247,7 @@ static int lessequal (lua_State *L, const TValue *l, const TValue *r) {
247} 247}
248 248
249 249
250int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2) { 250int luaV_equalval_ (lua_State *L, const TValue *t1, const TValue *t2) {
251 const TValue *tm; 251 const TValue *tm;
252 lua_assert(ttype(t1) == ttype(t2)); 252 lua_assert(ttype(t1) == ttype(t2));
253 switch (ttype(t1)) { 253 switch (ttype(t1)) {
diff --git a/lvm.h b/lvm.h
index adca8cdd..7fd88c71 100644
--- a/lvm.h
+++ b/lvm.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.h,v 2.4 2005/04/25 19:24:10 roberto Exp roberto $ 2** $Id: lvm.h,v 2.5 2005/08/22 18:54:49 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -19,11 +19,13 @@
19 (((o) = luaV_tonumber(o,n)) != NULL)) 19 (((o) = luaV_tonumber(o,n)) != NULL))
20 20
21#define equalobj(L,o1,o2) \ 21#define equalobj(L,o1,o2) \
22 (ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2)) 22 (ttype(o1) == ttype(o2) && luaV_equalval_(L, o1, o2))
23 23
24 24
25/* not to called directly */
26LUAI_FUNC int luaV_equalval_ (lua_State *L, const TValue *t1, const TValue *t2);
27
25LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r); 28LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
26LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
27LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n); 29LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
28LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); 30LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
29LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key, 31LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,