Commit 69003fd8 authored by Paul Eggert's avatar Paul Eggert
Browse files

2011-04-14 Paul Eggert <eggert@cs.ucla.edu>

* alloc.c (refill_memory_reserve): Now static if
!defined REL_ALLOC || defined SYSTEM_MALLOC.
* lisp.h (refill_memory_reserve): Declare only if not static.
parent a7ca3326
2011-04-14 Paul Eggert <eggert@cs.ucla.edu>
2011-04-14 Paul Eggert <eggert@cs.ucla.edu>
* alloc.c (refill_memory_reserve): Now static if
!defined REL_ALLOC || defined SYSTEM_MALLOC.
* lisp.h (refill_memory_reserve): Declare only if not static.
* xsettings.c, xsettings.h (xsettings_get_system_normal_font):
Define only if USE_LUCID.
......
......@@ -280,6 +280,9 @@ static void gc_sweep (void);
static void mark_glyph_matrix (struct glyph_matrix *);
static void mark_face_cache (struct face_cache *);
#if !defined REL_ALLOC || defined SYSTEM_MALLOC
static void refill_memory_reserve (void);
#endif
static struct Lisp_String *allocate_string (void);
static void compact_small_strings (void);
static void free_large_strings (void);
......
......@@ -2652,7 +2652,9 @@ extern void memory_full (void) NO_RETURN;
extern void buffer_memory_full (void) NO_RETURN;
extern int survives_gc_p (Lisp_Object);
extern void mark_object (Lisp_Object);
#if defined REL_ALLOC && !defined SYSTEM_MALLOC
extern void refill_memory_reserve (void);
#endif
extern const char *pending_malloc_warning;
extern Lisp_Object *stack_base;
EXFUN (Fcons, 2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment