summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnozaki <tnozaki@NetBSD.org>2009-01-02 22:08:19 +0000
committertnozaki <tnozaki@NetBSD.org>2009-01-02 22:08:19 +0000
commitf5fad0d00525205fe7c2ef9542bbbc8db37907ef (patch)
tree46c5111876e3769a45dbfb0becc13f4cffafdb52
parentbbc63cf4908c8235a80d39db266b6129b789f190 (diff)
1. fixes PR lib/40317, don't use libc's fparseln(3).
it is non-portable function, toolchain should link it yourself. 2. fixes crossbuild breakage reported by Chiristoph Egger on current-user, FreeBSD and MacOS X still make Rune* as public API in their ctype.h. so added namespace protection NB* by including src/lib/libc/locale/rune.h instead of src/lib/libc/locale/runetype.h.
-rw-r--r--usr.bin/mklocale/Makefile7
-rw-r--r--usr.bin/mklocale/lex.l6
-rw-r--r--usr.bin/mklocale/yacc.y6
3 files changed, 10 insertions, 9 deletions
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 2e6814fedff..3927275678a 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2009/01/02 00:20:23 tnozaki Exp $
+# $NetBSD: Makefile,v 1.13 2009/01/02 22:08:19 tnozaki Exp $
.ifndef HOSTPROG
.include <bsd.own.mk>
.endif
-.PATH: ${NETBSDSRCDIR}/lib/libc/locale ${NETBSDSRCDIR}/lib/libc/citrus
+.PATH: ${NETBSDSRCDIR}/lib/libc/locale ${NETBSDSRCDIR}/lib/libc/citrus ${NETBSDSRCDIR}/lib/libc/stdio
PROG= mklocale
SRCS= yacc.y lex.l mklocaledb.c fix_grouping.c \
- citrus_bcs_strtoul.c citrus_db_factory.c citrus_db_hash.c
+ citrus_bcs_strtoul.c citrus_db_factory.c citrus_db_hash.c \
+ fparseln.c
CPPFLAGS+= -I. -I${.CURDIR} \
-I${NETBSDSRCDIR}/lib/libc \
-I${NETBSDSRCDIR}/lib/libc/include \
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 124154a38bd..d91739cfd5a 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.l,v 1.14 2009/01/02 00:20:23 tnozaki Exp $ */
+/* $NetBSD: lex.l,v 1.15 2009/01/02 22:08:19 tnozaki Exp $ */
%{
/*-
@@ -42,11 +42,11 @@
#if 0
static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lex.l,v 1.14 2009/01/02 00:20:23 tnozaki Exp $");
+__RCSID("$NetBSD: lex.l,v 1.15 2009/01/02 22:08:19 tnozaki Exp $");
#endif
#endif /* not lint */
-#include "locale/runetype.h"
+#include "locale/rune.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 32c9282147a..25499475673 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.25 2009/01/02 00:20:23 tnozaki Exp $ */
+/* $NetBSD: yacc.y,v 1.26 2009/01/02 22:08:19 tnozaki Exp $ */
%{
/*-
@@ -43,7 +43,7 @@
static char sccsid[] = "@(#)yacc.y 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$FreeBSD$";
#else
-__RCSID("$NetBSD: yacc.y,v 1.25 2009/01/02 00:20:23 tnozaki Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.26 2009/01/02 22:08:19 tnozaki Exp $");
#endif
#endif /* not lint */
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: yacc.y,v 1.25 2009/01/02 00:20:23 tnozaki Exp $");
#include <arpa/inet.h> /* Needed for htonl on POSIX systems. */
#include <err.h>
-#include "locale/runetype.h"
+#include "locale/rune.h"
#include <locale.h>
#include <stddef.h>
#include <stdio.h>