Commit 524c7aa6 authored by Paul Eggert's avatar Paul Eggert
Browse files

* alloc.c (mark_fringe_data): Move decl from here ...

* lisp.h (mark_fringe_data) [HAVE_WINDOW_SYSTEM]: ... to here,
to check its interface.
(init_fringe_once): Do not declare unless HAVE_WINDOW_SYSTEM.
parent 58d2d479
2011-03-10 Paul Eggert <eggert@cs.ucla.edu> 2011-03-10 Paul Eggert <eggert@cs.ucla.edu>
   
* alloc.c (mark_fringe_data): Move decl from here ...
* lisp.h (mark_fringe_data) [HAVE_WINDOW_SYSTEM]: ... to here,
to check its interface.
(init_fringe_once): Do not declare unless HAVE_WINDOW_SYSTEM.
* fontset.c (free_realized_fontset): Now static. * fontset.c (free_realized_fontset): Now static.
(Fset_fontset_font): Rename local to avoid shadowing. (Fset_fontset_font): Rename local to avoid shadowing.
(fontset_font): Mark local as initialized. (fontset_font): Mark local as initialized.
...@@ -276,10 +276,6 @@ static void gc_sweep (void); ...@@ -276,10 +276,6 @@ static void gc_sweep (void);
static void mark_glyph_matrix (struct glyph_matrix *); static void mark_glyph_matrix (struct glyph_matrix *);
static void mark_face_cache (struct face_cache *); static void mark_face_cache (struct face_cache *);
#ifdef HAVE_WINDOW_SYSTEM
extern void mark_fringe_data (void);
#endif /* HAVE_WINDOW_SYSTEM */
static struct Lisp_String *allocate_string (void); static struct Lisp_String *allocate_string (void);
static void compact_small_strings (void); static void compact_small_strings (void);
static void free_large_strings (void); static void free_large_strings (void);
......
...@@ -2540,7 +2540,10 @@ extern Lisp_Object fmod_float (Lisp_Object x, Lisp_Object y); ...@@ -2540,7 +2540,10 @@ extern Lisp_Object fmod_float (Lisp_Object x, Lisp_Object y);
/* Defined in fringe.c */ /* Defined in fringe.c */
extern void syms_of_fringe (void); extern void syms_of_fringe (void);
extern void init_fringe (void); extern void init_fringe (void);
#ifdef HAVE_WINDOW_SYSTEM
extern void mark_fringe_data (void);
extern void init_fringe_once (void); extern void init_fringe_once (void);
#endif /* HAVE_WINDOW_SYSTEM */
/* Defined in image.c */ /* Defined in image.c */
extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data;
......
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