[Emacs-diffs] /srv/bzr/emacs/trunk r103626: Fix MS-Windows build broken by revision 103623.

[Eli Zaretskii]

------------------------------------------------------------
revno: 103626
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-11 11:41:56 +0200
message:
  Fix MS-Windows build broken by revision 103623.
  
   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 revno 103623.
modified:
  src/ChangeLog
  src/makefile.w32-in
  src/msdos.c
  src/term.c
  src/termhooks.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-11 07:24:21 +0000
+++ b/src/ChangeLog     2011-03-11 09:41:56 +0000
@@ -1,3 +1,15 @@
+2011-03-11  Eli Zaretskii  <address@hidden>
+
+       * 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 revno 103623.
+
 2011-03-11  Paul Eggert  <address@hidden>
 
        Fix some minor problems found by GCC 4.5.2's static checks.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2011-02-21 20:00:19 +0000
+++ b/src/makefile.w32-in       2011-03-11 09:41:56 +0000
@@ -1466,6 +1466,7 @@
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
+       $(SRC)/tparam.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -1498,6 +1499,7 @@
 
 $(BLD)/tparam.$(O) : \
        $(SRC)/tparam.c \
+       $(SRC)/tparam.h \
        $(CONFIG_H) \
        $(LISP_H)
 

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2011-02-27 19:51:35 +0000
+++ b/src/msdos.c       2011-03-11 09:41:56 +0000
@@ -844,6 +844,7 @@
 
 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)
 {

=== modified file 'src/term.c'
--- a/src/term.c        2011-03-09 06:21:25 +0000
+++ b/src/term.c        2011-03-11 09:41:56 +0000
@@ -501,7 +501,7 @@
    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;

=== modified file 'src/termhooks.h'
--- a/src/termhooks.h   2011-01-26 08:36:39 +0000
+++ b/src/termhooks.h   2011-03-11 09:41:56 +0000
@@ -654,6 +654,9 @@
 /* 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