Mercurial > emacs
comparison src/alloc.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 0781924c2a38 |
| children | 5a7d60b243f4 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 446 /* Sentinel node of the tree. */ | 446 /* Sentinel node of the tree. */ |
| 447 | 447 |
| 448 static struct mem_node mem_z; | 448 static struct mem_node mem_z; |
| 449 #define MEM_NIL &mem_z | 449 #define MEM_NIL &mem_z |
| 450 | 450 |
| 451 static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); | |
| 452 static struct Lisp_Vector *allocate_vectorlike (EMACS_INT); | 451 static struct Lisp_Vector *allocate_vectorlike (EMACS_INT); |
| 453 static void lisp_free (POINTER_TYPE *); | 452 static void lisp_free (POINTER_TYPE *); |
| 454 static void mark_stack (void); | 453 static void mark_stack (void); |
| 455 static int live_vector_p (struct mem_node *, void *); | 454 static int live_vector_p (struct mem_node *, void *); |
| 456 static int live_buffer_p (struct mem_node *, void *); | 455 static int live_buffer_p (struct mem_node *, void *); |
