mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00
Code Issues Releases Activity

* src/alloc.c (lisp_align_malloc): Remove unneeded prototype.

Browse Source
This commit is contained in:
Stefan Monnier 2012-04-10 20:51:44 -04:00
parent 0221e32392
commit 453b951e7d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2012-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
* alloc.c (lisp_align_malloc): Remove unneeded prototype.
2012-04-10 "Jason S. Cornez" <jcornez@ravenpack.com> (tiny change)
* keyboard.c: Override inhibit-quit after the third C-g (bug#6585).

14
src/alloc.c
View File

@ -296,7 +296,6 @@ enum mem_type
MEM_TYPE_VECTORLIKE
};
static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type);
static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
@ -938,9 +937,10 @@ lisp_free (POINTER_TYPE *block)
MALLOC_UNBLOCK_INPUT;
}
/* Allocation of aligned blocks of memory to store Lisp data. */
/* The entry point is lisp_align_malloc which returns blocks of at most */
/* BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */
/***** Allocation of aligned blocks of memory to store Lisp data. *****/
/* The entry point is lisp_align_malloc which returns blocks of at most
BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */
/* Use posix_memalloc if the system has it and we're using the system's
malloc (because our gmalloc.c routines don't have posix_memalign although
@ -1099,7 +1099,7 @@ lisp_align_malloc (size_t nbytes, enum mem_type type)
#endif
/* Initialize the blocks and put them on the free list.
Is `base' was not properly aligned, we can't use the last block. */
If `base' was not properly aligned, we can't use the last block. */
for (i = 0; i < (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1); i++)
{
abase->blocks[i].abase = abase;
@ -1146,8 +1146,8 @@ lisp_align_free (POINTER_TYPE *block)
ablock->x.next_free = free_ablock;
free_ablock = ablock;
/* Update busy count. */
ABLOCKS_BUSY (abase) =
(struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase));
ABLOCKS_BUSY (abase)
= (struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase));
if (2 > (intptr_t) ABLOCKS_BUSY (abase))
{ /* All the blocks are free. */