Module Name: src
Committed By: matt
Date: Mon Jul 11 02:30:49 UTC 2011
Modified Files:
src/sys/dev/ic: sti.c stivar.h
Log Message:
Fix
error: new qualifiers in middle of multi-level non-const cast are unsafe
by defining the type correctly thereby avoid the cast.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/stivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.15 src/sys/dev/ic/sti.c:1.16
--- src/sys/dev/ic/sti.c:1.15 Sat May 21 12:02:55 2011
+++ src/sys/dev/ic/sti.c Mon Jul 11 02:30:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $ */
+/* $NetBSD: sti.c,v 1.16 2011/07/11 02:30:49 matt Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.16 2011/07/11 02:30:49 matt Exp $");
#include "wsdisplay.h"
@@ -640,8 +640,7 @@
scr->scr_scrlist[0] = &scr->scr_wsd;
scr->scr_screenlist.nscreens = 1;
- scr->scr_screenlist.screens =
- (const struct wsscreen_descr **)scr->scr_scrlist;
+ scr->scr_screenlist.screens = scr->scr_scrlist;
return 0;
Index: src/sys/dev/ic/stivar.h
diff -u src/sys/dev/ic/stivar.h:1.6 src/sys/dev/ic/stivar.h:1.7
--- src/sys/dev/ic/stivar.h:1.6 Tue Nov 9 12:24:48 2010
+++ src/sys/dev/ic/stivar.h Mon Jul 11 02:30:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stivar.h,v 1.6 2010/11/09 12:24:48 skrll Exp $ */
+/* $NetBSD: stivar.h,v 1.7 2011/07/11 02:30:49 matt Exp $ */
/* $OpenBSD: stivar.h,v 1.24 2009/02/06 22:51:04 miod Exp $ */
@@ -96,7 +96,7 @@
int scr_nscreens;
u_int scr_wsmode;
struct wsscreen_descr scr_wsd;
- struct wsscreen_descr *scr_scrlist[1];
+ const struct wsscreen_descr *scr_scrlist[1];
struct wsscreen_list scr_screenlist;
};
