diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-03-11 11:41:56 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-03-11 11:41:56 +0200 |
| commit | 7ef4b50c04d80cbc2b247f997e9133fbce70be05 (patch) | |
| tree | f61246eb91390dec44320f4a9621b906f42b3cbf | |
| parent | 4f1f90cd9dac7134d85abe6e732afe1a6a9257f7 (diff) | |
| download | emacs-7ef4b50c04d80cbc2b247f997e9133fbce70be05.tar.gz emacs-7ef4b50c04d80cbc2b247f997e9133fbce70be05.tar.bz2 emacs-7ef4b50c04d80cbc2b247f997e9133fbce70be05.zip | |
Fix MS-Windows build broken by 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
src/term.c (encode_terminal_code): Now external again, used by
w32console.c and msdos.c.
src/termhooks.h (encode_terminal_code): Declare prototype.
src/msdos.c (encode_terminal_code): Don't declare prototype.
src/makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)): Depend
on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | src/msdos.c | 1 | ||||
| -rw-r--r-- | src/term.c | 2 | ||||
| -rw-r--r-- | src/termhooks.h | 3 |
5 files changed, 19 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3a6b09dfb1f..ebbef39c29d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2011-03-11 Eli Zaretskii <eliz@gnu.org> + + * termhooks.h (encode_terminal_code): Declare prototype. + + * msdos.c (encode_terminal_code): Don't declare prototype. + + * term.c (encode_terminal_code): Now external again, used by + w32console.c and msdos.c. + + * makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)): Depend + on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu. + 2011-03-11 Paul Eggert <eggert@cs.ucla.edu> Fix some minor problems found by GCC 4.5.2's static checks. diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 7a702fd45bf..81f758f1b5f 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1466,6 +1466,7 @@ $(BLD)/term.$(O) : \ $(SRC)/termchar.h \ $(SRC)/termhooks.h \ $(SRC)/termopts.h \ + $(SRC)/tparam.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -1498,6 +1499,7 @@ $(BLD)/textprop.$(O) : \ $(BLD)/tparam.$(O) : \ $(SRC)/tparam.c \ + $(SRC)/tparam.h \ $(CONFIG_H) \ $(LISP_H) diff --git a/src/msdos.c b/src/msdos.c index 261a09ac859..5d50749cb7e 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -844,6 +844,7 @@ IT_set_face (int face) extern unsigned char *encode_terminal_code (struct glyph *, int, struct coding_system *); + static void IT_write_glyphs (struct frame *f, struct glyph *str, int str_len) { diff --git a/src/term.c b/src/term.c index e78e2e68814..e84bbe125f8 100644 --- a/src/term.c +++ b/src/term.c @@ -501,7 +501,7 @@ static int encode_terminal_dst_size; Set CODING->produced to the byte-length of the resulting byte sequence, and return a pointer to that byte sequence. */ -static unsigned char * +unsigned char * encode_terminal_code (struct glyph *src, int src_len, struct coding_system *coding) { struct glyph *src_end = src + src_len; diff --git a/src/termhooks.h b/src/termhooks.h index b147f6ed0a1..0ccd2dac9e1 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -654,6 +654,9 @@ extern void delete_terminal (struct terminal *); /* The initial terminal device, created by initial_term_init. */ extern struct terminal *initial_terminal; +extern unsigned char *encode_terminal_code (struct glyph *, int, + struct coding_system *); + #ifdef HAVE_GPM extern void close_gpm (int gpm_fd); #endif |