[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107857: * src/alloc.c (lisp_align_ma
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107857: * src/alloc.c (lisp_align_malloc): Remove unneeded prototype. |
Date: |
Tue, 10 Apr 2012 20:51:44 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107857
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 20:51:44 -0400
message:
* src/alloc.c (lisp_align_malloc): Remove unneeded prototype.
modified:
src/ChangeLog
src/alloc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-04-10 19:36:17 +0000
+++ b/src/ChangeLog 2012-04-11 00:51:44 +0000
@@ -1,3 +1,7 @@
+2012-04-11 Stefan Monnier <address@hidden>
+
+ * alloc.c (lisp_align_malloc): Remove unneeded prototype.
+
2012-04-10 "Jason S. Cornez" <address@hidden> (tiny change)
* keyboard.c: Override inhibit-quit after the third C-g (bug#6585).
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2012-04-09 13:05:48 +0000
+++ b/src/alloc.c 2012-04-11 00:51:44 +0000
@@ -296,7 +296,6 @@
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 @@
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 @@
#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 @@
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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107857: * src/alloc.c (lisp_align_malloc): Remove unneeded prototype.,
Stefan Monnier <=