aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/alloc.c b/src/alloc.c
index a1c78a408d9..e754e2f6aa2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -143,8 +143,6 @@ static pthread_mutex_t alloc_mutex;
143 143
144static __malloc_size_t bytes_used_when_full; 144static __malloc_size_t bytes_used_when_full;
145 145
146static __malloc_size_t bytes_used_when_reconsidered;
147
148/* Mark, unmark, query mark bit of a Lisp string. S must be a pointer 146/* Mark, unmark, query mark bit of a Lisp string. S must be a pointer
149 to a struct Lisp_String. */ 147 to a struct Lisp_String. */
150 148
@@ -1140,6 +1138,8 @@ static void * (*old_malloc_hook) (size_t, const void *);
1140static void * (*old_realloc_hook) (void *, size_t, const void*); 1138static void * (*old_realloc_hook) (void *, size_t, const void*);
1141static void (*old_free_hook) (void*, const void*); 1139static void (*old_free_hook) (void*, const void*);
1142 1140
1141static __malloc_size_t bytes_used_when_reconsidered;
1142
1143/* This function is used as the hook for free to call. */ 1143/* This function is used as the hook for free to call. */
1144 1144
1145static void 1145static void
@@ -1491,8 +1491,7 @@ mark_interval_tree (register INTERVAL tree)
1491 can't create number objects in macros. */ 1491 can't create number objects in macros. */
1492#ifndef make_number 1492#ifndef make_number
1493Lisp_Object 1493Lisp_Object
1494make_number (n) 1494make_number (EMACS_INT n)
1495 EMACS_INT n;
1496{ 1495{
1497 Lisp_Object obj; 1496 Lisp_Object obj;
1498 obj.s.val = n; 1497 obj.s.val = n;
@@ -5270,7 +5269,7 @@ mark_char_table (struct Lisp_Vector *ptr)
5270 { 5269 {
5271 Lisp_Object val = ptr->contents[i]; 5270 Lisp_Object val = ptr->contents[i];
5272 5271
5273 if (INTEGERP (val) || SYMBOLP (val) && XSYMBOL (val)->gcmarkbit) 5272 if (INTEGERP (val) || (SYMBOLP (val) && XSYMBOL (val)->gcmarkbit))
5274 continue; 5273 continue;
5275 if (SUB_CHAR_TABLE_P (val)) 5274 if (SUB_CHAR_TABLE_P (val))
5276 { 5275 {