summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lua/src/lmem.c
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/lua/src/lmem.c')
-rw-r--r--3rdparty/lua/src/lmem.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/3rdparty/lua/src/lmem.c b/3rdparty/lua/src/lmem.c
index ee343e3e037..4feaf036c72 100644
--- a/3rdparty/lua/src/lmem.c
+++ b/3rdparty/lua/src/lmem.c
@@ -1,15 +1,17 @@
/*
-** $Id: lmem.c,v 1.84.1.1 2013/04/12 18:48:47 roberto Exp $
+** $Id: lmem.c,v 1.89 2014/11/02 19:33:33 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
-
-#include <stddef.h>
-
#define lmem_c
#define LUA_CORE
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
#include "lua.h"
#include "ldebug.h"
@@ -24,15 +26,15 @@
/*
** About the realloc function:
** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
-** (`osize' is the old size, `nsize' is the new size)
+** ('osize' is the old size, 'nsize' is the new size)
**
-** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no
+** * frealloc(ud, NULL, x, s) creates a new block of size 's' (no
** matter 'x').
**
-** * frealloc(ud, p, x, 0) frees the block `p'
+** * frealloc(ud, p, x, 0) frees the block 'p'
** (in this specific case, frealloc must return NULL);
** particularly, frealloc(ud, NULL, 0, 0) does nothing
-** (which is equivalent to free(NULL) in ANSI C)
+** (which is equivalent to free(NULL) in ISO C)
**
** frealloc returns NULL if it cannot create or reallocate the area
** (any reallocation to an equal or smaller size cannot fail!)
@@ -83,12 +85,10 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
#endif
newblock = (*g->frealloc)(g->ud, block, osize, nsize);
if (newblock == NULL && nsize > 0) {
- api_check(L, nsize > realosize,
+ api_check( nsize > realosize,
"realloc cannot fail when shrinking a block");
- if (g->gcrunning) {
- luaC_fullgc(L, 1); /* try to free some memory... */
- newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
- }
+ luaC_fullgc(L, 1); /* try to free some memory... */
+ newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
if (newblock == NULL)
luaD_throw(L, LUA_ERRMEM);
}