XEmacs 21.4.19 (Constant Variable).

[chise/xemacs-chise.git.1] / src / console.h

diff --git a/src/console.h b/src/console.h
index 214e8c2..9d9d65c 100644 (file)
--- a/src/console.h
+++ b/src/console.h
@@ -25,8 +25,6 @@ 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.
@@ -177,7 +175,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 Charc *str, Charcount len);
+                           const Emchar *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);
@@ -204,7 +202,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,
-                               Charc_dynarr *buf, int xpos, int xoffset,
+                               Emchar_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);