summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-15 23:39:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-15 23:39:21 -0700
commit4b5afbb0d98ba4a95359ca5edaee8c3ecd7ae007 (patch)
treedd789befe8850af70f75722f4b224de11ed1e988 /src
parentc505aaeb00a1c4f01e79f6e82216f83e33a77426 (diff)
downloademacs-4b5afbb0d98ba4a95359ca5edaee8c3ecd7ae007.tar.gz
* alloc.c: Remove one incorrect comment and fix another.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/alloc.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7172ba605f5..e321a70d4c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,7 @@
GC_MALLOC_CHECK) && GC_MALLOC_CHECK), to match when it's used.
(NEED_MEM_INSERT): New macro.
(mem_insert, mem_insert_fixup) [!NEED_MEM_INSERT]: Remove; unused.
+ Remove one incorrect comment and fix another.
Fix minor ralloc.c problems found by static checking.
See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
diff --git a/src/alloc.c b/src/alloc.c
index 9589ae05e95..400b11c296a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -948,9 +948,6 @@ lisp_free (POINTER_TYPE *block)
/* 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
- its memalloc could be used). */
#if defined (HAVE_POSIX_MEMALIGN) && defined (SYSTEM_MALLOC)
#define USE_POSIX_MEMALIGN 1
#endif
@@ -1007,7 +1004,7 @@ struct ablocks
struct ablock blocks[ABLOCKS_SIZE];
};
-/* Size of the block requested from malloc or memalign. */
+/* Size of the block requested from malloc or posix_memalign. */
#define ABLOCKS_BYTES (sizeof (struct ablocks) - BLOCK_PADDING)
#define ABLOCK_ABASE(block) \