aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-13 22:55:38 -0700
committerPaul Eggert2011-03-13 22:55:38 -0700
commitda2f2dd9c2fac1bb1e3d5e5c4a3b38cad3c20ad5 (patch)
tree98665220d0ec9e3934973b51401cf0b9ebd780bd /src
parent2f2650daaab043eb8f7fb16fd10575552a7cd378 (diff)
downloademacs-da2f2dd9c2fac1bb1e3d5e5c4a3b38cad3c20ad5.tar.gz
emacs-da2f2dd9c2fac1bb1e3d5e5c4a3b38cad3c20ad5.zip
* keyboard.h (mark_kboards): Move decl here ...
* alloc.c (mark_kboards): ... from here.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/alloc.c1
-rw-r--r--src/keyboard.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a90b5f6e247..9cddd389b58 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
5 (poll_for_input, handle_async_input): Now static. 5 (poll_for_input, handle_async_input): Now static.
6 6
7 * keyboard.h (make_ctrl_char): New decl. 7 * keyboard.h (make_ctrl_char): New decl.
8 (mark_kboards): Move decl here ...
9 * alloc.c (mark_kboards): ... from here.
8 10
9 * lisp.h (force_auto_save_soon): New decl. 11 * lisp.h (force_auto_save_soon): New decl.
10 12
diff --git a/src/alloc.c b/src/alloc.c
index 6c92f36ca7d..d6b64de5af9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -270,7 +270,6 @@ Lisp_Object Qpost_gc_hook;
270 270
271static void mark_buffer (Lisp_Object); 271static void mark_buffer (Lisp_Object);
272static void mark_terminals (void); 272static void mark_terminals (void);
273extern void mark_kboards (void);
274extern void mark_backtrace (void); 273extern void mark_backtrace (void);
275static void gc_sweep (void); 274static void gc_sweep (void);
276static void mark_glyph_matrix (struct glyph_matrix *); 275static void mark_glyph_matrix (struct glyph_matrix *);
diff --git a/src/keyboard.h b/src/keyboard.h
index 9f8f1ff7476..765979b3997 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -518,3 +518,4 @@ extern void add_user_signal (int, const char *);
518extern int tty_read_avail_input (struct terminal *, int, 518extern int tty_read_avail_input (struct terminal *, int,
519 struct input_event *); 519 struct input_event *);
520extern EMACS_TIME timer_check (int); 520extern EMACS_TIME timer_check (int);
521extern void mark_kboards (void);