diff options
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/alloc.c | 5 |
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 @@ | |||
| 8 | GC_MALLOC_CHECK) && GC_MALLOC_CHECK), to match when it's used. | 8 | GC_MALLOC_CHECK) && GC_MALLOC_CHECK), to match when it's used. |
| 9 | (NEED_MEM_INSERT): New macro. | 9 | (NEED_MEM_INSERT): New macro. |
| 10 | (mem_insert, mem_insert_fixup) [!NEED_MEM_INSERT]: Remove; unused. | 10 | (mem_insert, mem_insert_fixup) [!NEED_MEM_INSERT]: Remove; unused. |
| 11 | Remove one incorrect comment and fix another. | ||
| 11 | 12 | ||
| 12 | Fix minor ralloc.c problems found by static checking. | 13 | Fix minor ralloc.c problems found by static checking. |
| 13 | See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html | 14 | 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) | |||
| 948 | /* The entry point is lisp_align_malloc which returns blocks of at most | 948 | /* The entry point is lisp_align_malloc which returns blocks of at most |
| 949 | BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ | 949 | BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ |
| 950 | 950 | ||
| 951 | /* Use posix_memalloc if the system has it and we're using the system's | ||
| 952 | malloc (because our gmalloc.c routines don't have posix_memalign although | ||
| 953 | its memalloc could be used). */ | ||
| 954 | #if defined (HAVE_POSIX_MEMALIGN) && defined (SYSTEM_MALLOC) | 951 | #if defined (HAVE_POSIX_MEMALIGN) && defined (SYSTEM_MALLOC) |
| 955 | #define USE_POSIX_MEMALIGN 1 | 952 | #define USE_POSIX_MEMALIGN 1 |
| 956 | #endif | 953 | #endif |
| @@ -1007,7 +1004,7 @@ struct ablocks | |||
| 1007 | struct ablock blocks[ABLOCKS_SIZE]; | 1004 | struct ablock blocks[ABLOCKS_SIZE]; |
| 1008 | }; | 1005 | }; |
| 1009 | 1006 | ||
| 1010 | /* Size of the block requested from malloc or memalign. */ | 1007 | /* Size of the block requested from malloc or posix_memalign. */ |
| 1011 | #define ABLOCKS_BYTES (sizeof (struct ablocks) - BLOCK_PADDING) | 1008 | #define ABLOCKS_BYTES (sizeof (struct ablocks) - BLOCK_PADDING) |
| 1012 | 1009 | ||
| 1013 | #define ABLOCK_ABASE(block) \ | 1010 | #define ABLOCK_ABASE(block) \ |