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

* lisp.h (mark_ttys): ... to here, so that it's checked against defn.

diff --git a/src/ChangeLog b/src/ChangeLog
index a3695bda635764df10bbca18acbd571567743609..8bbc818ec7dd579bd4ce07594209276928a700d7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -110,6 +110,9 @@
 
        * term.c (term_mouse_position): Rename local to avoid shadowing.
 
+       * alloc.c (mark_ttys): Move decl from here ...
+       * lisp.h (mark_ttys): ... to here, so that it's checked against defn.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
        * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06

diff --git a/src/alloc.c b/src/alloc.c
index d7006ca6bfdda1961905f0e5f0cb9e6e018c9c02..8632897606a81a10705ce5f2847de5111089c6b8 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -271,7 +271,6 @@ Lisp_Object Qpost_gc_hook;
 static void mark_buffer (Lisp_Object);
 static void mark_terminals (void);
 extern void mark_kboards (void);
-extern void mark_ttys (void);
 extern void mark_backtrace (void);
 static void gc_sweep (void);
 static void mark_glyph_matrix (struct glyph_matrix *);

diff --git a/src/lisp.h b/src/lisp.h
index 719d72d28a4df9caf5b6bfe37a48477ff0c553da..1e8e01cf91f745c2fa329a89915de0aee71f4cbb 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3378,6 +3378,7 @@ extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object,
 
 /* Defined in term.c */
 extern int *char_ins_del_vector;
+extern void mark_ttys (void);
 extern void syms_of_term (void);
 extern void fatal (const char *msgid, ...) NO_RETURN;