* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 719984f503859e459b0b24816259793d4f0ab15b..55e003142d4cb7488a561aefd30c869cb171f128 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 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.
        (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 8632897606a81a10705ce5f2847de5111089c6b8..6c92f36ca7d6db3b3b942347fcaa7b806c3d7a7f 100644 (file)
--- 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 fa8cb223a6a7502da3f0bef69b9e0c5d5f04b9d9..113585320af50b20ec81a3d62d7096a1bbd2cf94 100644 (file)
--- 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;