mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 19:10:37 -08:00
Code Issues Projects Releases Wiki Activity

Fix MS-Windows build broken by 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2011-03-11 11:41:56 +02:00
parent 4f1f90cd9d
commit 7ef4b50c04
5 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ChangeLog
View file

@ -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.

2
src/makefile.w32-in
View file

@ -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)

1
src/msdos.c
View file

@ -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)
{

2
src/term.c
View file

@ -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;

3
src/termhooks.h
View file

@ -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