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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a6b09dfb1f3cd908f9210dadbe0c69db1a9954a..ebbef39c29d27afe3372d412f342bfff5bc578de 100644 (file)
--- 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 7a702fd45bf07f04067885821b22c1b9de799717..81f758f1b5f7a92b6b790f9c24a83cf7a68571c4 100644 (file)
--- 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 261a09ac8591eececc99df5afc5829cba0e1a4a2..5d50749cb7ebbc42552ca700b52d606073440fe3 100644 (file)
--- 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 e78e2e688140b8bdb0d82f2fba43f335cf11151b..e84bbe125f841439d054570fb3a296f9425be639 100644 (file)
--- 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 b147f6ed0a1da2088fb48d3ce37eca80d24295b6..0ccd2dac9e15074c78ef31af10ca06ba5839270e 100644 (file)
--- 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