From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 10 Mar 2011 02:01:53 +0000 (-0800)
Subject: * alloc.c (mark_fringe_data): Move decl from here ...
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=524c7aa6108b4178ca8436db8022686d180a5ca5;p=emacs.git

* 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 719984f5038..55e003142d4 100644
--- 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 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;