diff options
| author | Paul Eggert | 2011-03-08 21:40:59 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-08 21:40:59 -0800 |
| commit | e6ca6543685fded0d1b3322dd06d0fa70d3e2a44 (patch) | |
| tree | 969ad9f2d24435ee2767372bb0fd6ac91859e4a5 | |
| parent | 7f3f1250d4f74203c828e7ba03b721b1f269a0d7 (diff) | |
| download | emacs-e6ca6543685fded0d1b3322dd06d0fa70d3e2a44.tar.gz emacs-e6ca6543685fded0d1b3322dd06d0fa70d3e2a44.zip | |
* alloc.c (mark_ttys): Move decl from here ...
* lisp.h (mark_ttys): ... to here, so that it's checked against defn.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/alloc.c | 1 | ||||
| -rw-r--r-- | src/lisp.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a3695bda635..8bbc818ec7d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -110,6 +110,9 @@ | |||
| 110 | 110 | ||
| 111 | * term.c (term_mouse_position): Rename local to avoid shadowing. | 111 | * term.c (term_mouse_position): Rename local to avoid shadowing. |
| 112 | 112 | ||
| 113 | * alloc.c (mark_ttys): Move decl from here ... | ||
| 114 | * lisp.h (mark_ttys): ... to here, so that it's checked against defn. | ||
| 115 | |||
| 113 | 2011-03-06 Chong Yidong <cyd@stupidchicken.com> | 116 | 2011-03-06 Chong Yidong <cyd@stupidchicken.com> |
| 114 | 117 | ||
| 115 | * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 | 118 | * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 |
diff --git a/src/alloc.c b/src/alloc.c index d7006ca6bfd..8632897606a 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -271,7 +271,6 @@ Lisp_Object Qpost_gc_hook; | |||
| 271 | static void mark_buffer (Lisp_Object); | 271 | static void mark_buffer (Lisp_Object); |
| 272 | static void mark_terminals (void); | 272 | static void mark_terminals (void); |
| 273 | extern void mark_kboards (void); | 273 | extern void mark_kboards (void); |
| 274 | extern void mark_ttys (void); | ||
| 275 | extern void mark_backtrace (void); | 274 | extern void mark_backtrace (void); |
| 276 | static void gc_sweep (void); | 275 | static void gc_sweep (void); |
| 277 | static void mark_glyph_matrix (struct glyph_matrix *); | 276 | static void mark_glyph_matrix (struct glyph_matrix *); |
diff --git a/src/lisp.h b/src/lisp.h index 719d72d28a4..1e8e01cf91f 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3378,6 +3378,7 @@ extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object, | |||
| 3378 | 3378 | ||
| 3379 | /* Defined in term.c */ | 3379 | /* Defined in term.c */ |
| 3380 | extern int *char_ins_del_vector; | 3380 | extern int *char_ins_del_vector; |
| 3381 | extern void mark_ttys (void); | ||
| 3381 | extern void syms_of_term (void); | 3382 | extern void syms_of_term (void); |
| 3382 | extern void fatal (const char *msgid, ...) NO_RETURN; | 3383 | extern void fatal (const char *msgid, ...) NO_RETURN; |
| 3383 | 3384 | ||