Index: Makefile
===================================================================
--- Makefile	(revision 290505)
+++ Makefile	(working copy)
@@ -13,12 +13,9 @@
 	time.c \
 	wide.c
 
-WARNS=	3
 ${SRCS:M*.c}: parser.h
 parser.h: parser.y
 
-IGNORE_PRAGMA=	yes
-
 CFLAGS+=	-I. -I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/../../lib/libc/locale
 CFLAGS+=	-I${.CURDIR}/../../lib/libc/stdtime
Index: charmap.c
===================================================================
--- charmap.c	(revision 290505)
+++ charmap.c	(working copy)
@@ -68,11 +68,8 @@
  * Array of POSIX specific portable characters.
  */
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-
 static const struct {
-	char	*name;
+	const char *name;
 	int	ch;
 } portable_chars[] = {
 	{ "NUL",		'\0' },
@@ -189,8 +186,6 @@
 	{ NULL, 0 }
 };
 
-#pragma GCC diagnostic pop
-
 static int
 cmap_compare_sym(const void *n1, const void *n2)
 {
@@ -220,7 +215,7 @@
 }
 
 static void
-add_charmap_impl(char *sym, wchar_t wc, int nodups)
+add_charmap_impl(const char *sym, wchar_t wc, int nodups)
 {
 	charmap_t	srch;
 	charmap_t	*n = NULL;
@@ -260,7 +255,7 @@
 }
 
 void
-add_charmap(char *sym, int c)
+add_charmap(const char *sym, int c)
 {
 	add_charmap_impl(sym, c, 1);
 }
@@ -322,7 +317,7 @@
 }
 
 void
-add_charmap_char(char *name, int val)
+add_charmap_char(const char *name, int val)
 {
 	add_charmap_impl(name, val, 0);
 }
Index: localedef.c
===================================================================
--- localedef.c	(revision 290505)
+++ localedef.c	(working copy)
@@ -54,7 +54,7 @@
 #define	TEXT_DOMAIN	"SYS_TEST"
 #endif
 
-int bsd = 0;
+static int bsd = 0;
 int verbose = 0;
 int undefok = 0;
 int warnok = 0;
Index: localedef.h
===================================================================
--- localedef.h	(revision 290505)
+++ localedef.h	(working copy)
@@ -76,11 +76,11 @@
 
 /* charmap.c - CHARMAP handling */
 void init_charmap(void);
-void add_charmap(char *, int);
+void add_charmap(const char *, int);
 void add_charmap_undefined(char *);
 void add_charmap_posix(void);
 void add_charmap_range(char *, char *, int);
-void add_charmap_char(char *name, int val);
+void add_charmap_char(const char *name, int val);
 int lookup_charmap(const char *, wchar_t *);
 int check_charmap_undefined(char *);
 int check_charmap(wchar_t);