From: tomo <tomo>
Date: Fri, 9 Jun 2000 08:42:18 +0000 (+0000)
Subject: - Include "character.h".
X-Git-Tag: r21-2-34-utf-2000-0_16-1~55
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0294fb7349fd08d44a53542ece65696d78d18ca0;p=chise%2Fxemacs-chise.git

- Include "character.h".
(struct console_methods): Use <const Charc *> instead of <const Emchar
*> in `text_width_method'; use <Charc_dynarr *> instead of
<Emchar_dynarr *> in output_string_method.
---

diff --git a/src/console.h b/src/console.h
index 6e3118b..7c33839 100644
--- a/src/console.h
+++ b/src/console.h
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA.  */
 #ifndef INCLUDED_console_h_
 #define INCLUDED_console_h_
 
+#include "character.h"
+
 /* Devices and consoles are similar entities.  The idea is that
    a console represents a physical keyboard/mouse/other-input-source
    while a device represents a display where frames appear on.
@@ -141,7 +143,7 @@ struct console_methods
   int (*left_margin_width_method) (struct window *);
   int (*right_margin_width_method) (struct window *);
   int (*text_width_method) (struct frame *f, struct face_cachel *cachel,
-			    const Emchar *str, Charcount len);
+			    const Charc *str, Charcount len);
   void (*output_display_block_method) (struct window *, struct display_line *,
 				       int, int, int, int, int, int, int);
   int (*divider_height_method) (void);
@@ -168,7 +170,7 @@ struct console_methods
 				face_index findex, int cursor_start, int cursor_width,
 				int cursor_height, int offset_bitmap);
   void (*output_string_method) (struct window *w, struct display_line *dl,
-				Emchar_dynarr *buf, int xpos, int xoffset,
+				Charc_dynarr *buf, int xpos, int xoffset,
 				int start_pixpos, int width, face_index findex,
 				int cursor, int cursor_start, int cursor_width,
 				int cursor_height);