From 4c628d0c04641a9e454808b29c7d9238c54cd790 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 20 Nov 2001 03:40:57 +0000
Subject: [PATCH] fbdev stuff is now warnings clean, so all -Werror for it

---
 include/fbset.h                    | 2 +-
 libs/video/targets/Makefile.am     | 5 -----
 libs/video/targets/fbset_modes_y.y | 2 +-
 libs/video/targets/vid_fbdev.c     | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/fbset.h b/include/fbset.h
index 842f7b331..8e625252f 100644
--- a/include/fbset.h
+++ b/include/fbset.h
@@ -38,7 +38,7 @@ struct color {
 
 struct VideoMode {
     struct VideoMode *next;
-    char *name;
+    const char *name;
     /* geometry */
     __u32 xres;
     __u32 yres;
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
index 5ade581d6..481a19916 100644
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@@ -50,11 +50,6 @@ libQFfbdev_la_SOURCES=	fbset.c fbset_modes_y.y fbset_modes_l.l \
 			in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c \
 			$(in_common_SOURCE)
 
-fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c
-	$(LTCOMPILE) -Wno-error -c $<
-fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c
-	$(LTCOMPILE) -Wno-error -c $<
-
 #
 # OpenGL in X Window
 #
diff --git a/libs/video/targets/fbset_modes_y.y b/libs/video/targets/fbset_modes_y.y
index 616613d51..89b5ab310 100644
--- a/libs/video/targets/fbset_modes_y.y
+++ b/libs/video/targets/fbset_modes_y.y
@@ -41,7 +41,7 @@ static void ClearVideoMode(void)
 
 %union {
 	int		int_val;
-	char	*string;
+	const char	*string;
 }
 
 %token MODE GEOMETRY TIMINGS HSYNC VSYNC CSYNC GSYNC EXTSYNC BCAST LACED DOUBLE
diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c
index c247bf944..05894d6c0 100644
--- a/libs/video/targets/vid_fbdev.c
+++ b/libs/video/targets/vid_fbdev.c
@@ -241,7 +241,7 @@ VID_InitModes (void)
 	num_modes = VID_NumModes();
 }
 
-static char *
+static const char *
 get_mode (char *name, int width, int height, int depth)
 {
 	struct VideoMode *vmode;