From 60633629aa82a00a996f7ffcc17f2e385d33a71e Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 4 Oct 2002 10:23:00 +0000 Subject: hurd/ 2002-10-04 Marcus Brinkmann * console.h (struct cons_display): Doc fix. libcons/ 2002-10-04 Marcus Brinkmann * vcons-open.c (cons_vcons_open): Add casts to silence gcc warning. --- hurd/ChangeLog | 4 ++++ hurd/console.h | 2 +- libcons/ChangeLog | 5 +++++ libcons/vcons-open.c | 8 ++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hurd/ChangeLog b/hurd/ChangeLog index 9cc4999f..53dfab8e 100644 --- a/hurd/ChangeLog +++ b/hurd/ChangeLog @@ -1,3 +1,7 @@ +2002-10-04 Marcus Brinkmann + + * console.h (struct cons_display): Doc fix. + 2002-09-18 Marcus Brinkmann * console.h (struct cons_display): Add a new flag diff --git a/hurd/console.h b/hurd/console.h index 11a40dfc..30829776 100644 --- a/hurd/console.h +++ b/hurd/console.h @@ -119,7 +119,7 @@ struct cons_display preceeding CUR_LINE. */ uint32_t height; /* Number of lines in visible area following (and including) CUR_LINE. */ - uint32_t matrix; /* Index (in wchar_t) of the beginning of + uint32_t matrix; /* Index (in uint32_t) of the beginning of screen matrix in this structure. */ } screen; diff --git a/libcons/ChangeLog b/libcons/ChangeLog index 27133687..445e4f2c 100644 --- a/libcons/ChangeLog +++ b/libcons/ChangeLog @@ -1,3 +1,8 @@ +2002-10-04 Marcus Brinkmann + + * vcons-open.c (cons_vcons_open): Add casts to silence gcc + warning. + 2002-09-22 Marcus Brinkmann * vcons-refresh.c (cons_vcons_refresh): Take VCONS->scrolling into diff --git a/libcons/vcons-open.c b/libcons/vcons-open.c index 8841b938..8c34fc5e 100644 --- a/libcons/vcons-open.c +++ b/libcons/vcons-open.c @@ -126,11 +126,11 @@ cons_vcons_open (cons_t cons, vcons_list_t vcons_entry, vcons_t *r_vcons) vcons->state.screen.width = vcons->display->screen.width; vcons->state.screen.height = vcons->display->screen.height; vcons->state.screen.lines = vcons->display->screen.lines; - vcons->state.screen.matrix = ((wchar_t *) vcons->display) - + vcons->display->screen.matrix; + vcons->state.screen.matrix = (conchar_t *) + (((uint32_t *) vcons->display) + vcons->display->screen.matrix); vcons->state.changes.length = vcons->display->changes.length; - vcons->state.changes.buffer = ((uint32_t *) vcons->display) - + vcons->display->changes.buffer; + vcons->state.changes.buffer = (cons_change_t *) + (((uint32_t *) vcons->display) + vcons->display->changes.buffer); /* Request notification messages. */ notify = ports_get_right (vcons); -- cgit v1.2.3