diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:15:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:15:34 -0700 |
| commit | 333d54dade1e7005d5a97612907158fe5ec3d310 (patch) | |
| tree | a5b18c9c6a68d71fddae98aba0d81079068a8c46 /src/alloc.c | |
| parent | 90856fe0b82ba19d1c3d73a4ba48007380201e66 (diff) | |
| parent | 620c53a664e41788f6d4f8e3f687e1a0d448b857 (diff) | |
| download | emacs-333d54dade1e7005d5a97612907158fe5ec3d310.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index f62ae125408..e627af6c071 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -989,13 +989,11 @@ lisp_align_malloc (size_t nbytes, enum mem_type type) free_ablock = free_ablock->x.next_free; #if GC_MARK_STACK && !defined GC_MALLOC_CHECK - if (val && type != MEM_TYPE_NON_LISP) + if (type != MEM_TYPE_NON_LISP) mem_insert (val, (char *) val + nbytes, type); #endif MALLOC_UNBLOCK_INPUT; - if (!val && nbytes) - memory_full (); eassert (0 == ((uintptr_t) val) % BLOCK_ALIGN); return val; |