From 524c7aa6108b4178ca8436db8022686d180a5ca5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Mar 2011 18:01:53 -0800 Subject: [PATCH] * 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. --- src/ChangeLog | 5 +++++ src/alloc.c | 4 ---- src/lisp.h | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 719984f5038..55e003142d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-03-10 Paul Eggert + * 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. (Fset_fontset_font): Rename local to avoid shadowing. (fontset_font): Mark local as initialized. diff --git a/src/alloc.c b/src/alloc.c index 8632897606a..6c92f36ca7d 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -276,10 +276,6 @@ static void gc_sweep (void); static void mark_glyph_matrix (struct glyph_matrix *); 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 void compact_small_strings (void); static void free_large_strings (void); diff --git a/src/lisp.h b/src/lisp.h index fa8cb223a6a..113585320af 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2540,7 +2540,10 @@ extern Lisp_Object fmod_float (Lisp_Object x, Lisp_Object y); /* Defined in fringe.c */ extern void syms_of_fringe (void); extern void init_fringe (void); +#ifdef HAVE_WINDOW_SYSTEM +extern void mark_fringe_data (void); extern void init_fringe_once (void); +#endif /* HAVE_WINDOW_SYSTEM */ /* Defined in image.c */ extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; -- 2.39.2