[src/perseant-stdc-iso10646]: src Make it compile again when __STDC_ISO_10646...

[perseant <perseant%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/881f6f7bd058
branches:  perseant-stdc-iso10646
changeset: 850683:881f6f7bd058
user:      perseant <perseant%NetBSD.org@localhost>
date:      Mon Aug 07 14:27:11 2017 +0000

description:
Make it compile again when __STDC_ISO_10646__ is not defined.

diffstat:

 lib/libc/locale/_wctrans_local.h |  4 ++--
 lib/libc/locale/rune.c           |  6 ++----
 usr.bin/Makefile                 |  4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r f9d337f725d8 -r 881f6f7bd058 lib/libc/locale/_wctrans_local.h
--- a/lib/libc/locale/_wctrans_local.h  Sat Aug 05 20:30:41 2017 +0000
+++ b/lib/libc/locale/_wctrans_local.h  Mon Aug 07 14:27:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _wctrans_local.h,v 1.9.40.1 2017/07/21 20:22:29 perseant Exp $ */
+/*     $NetBSD: _wctrans_local.h,v 1.9.40.2 2017/08/07 14:27:11 perseant Exp $ */
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -40,7 +40,7 @@
 static __inline wint_t
 _towctrans_priv(wint_ucs4_t c, _WCTransEntry const *te, const _RuneLocale *rl)
 {
-       wint_kuten_t ktc;
+       wint_kuten_t ktc = 0;
 
        _citrus_ctype_ucs2kt(rl->rl_citrus_ctype, &ktc, c);
        ktc = (_RUNE_ISCACHED(ktc)
diff -r f9d337f725d8 -r 881f6f7bd058 lib/libc/locale/rune.c
--- a/lib/libc/locale/rune.c    Sat Aug 05 20:30:41 2017 +0000
+++ b/lib/libc/locale/rune.c    Mon Aug 07 14:27:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rune.c,v 1.46.22.2 2017/07/21 20:22:29 perseant Exp $  */
+/*     $NetBSD: rune.c,v 1.46.22.3 2017/08/07 14:27:11 perseant Exp $  */
 /*-
  * Copyright (c)2010 Citrus Project,
  * All rights reserved.
@@ -312,12 +312,10 @@
 
 #define CONVERT_MAP(name)                                              \
 do {                                                                   \
-       wint_ucs4_t map;                                                \
-       wint_kuten_t kmap;                                              \
+       wint_kuten_t map;                                               \
        int c;                                                          \
                                                                        \
        map = _towctrans_priv(wc, _wctrans_##name(rl), rl);             \
-       _citrus_ctype_ucs2kt(rl->rl_citrus_ctype, &kmap, map);          \
        if (map == wc || (_citrus_ctype_wctob(rl->rl_citrus_ctype,      \
            map, &c)  || c == EOF))                                     \
                c = i;                                                  \
diff -r f9d337f725d8 -r 881f6f7bd058 usr.bin/Makefile
--- a/usr.bin/Makefile  Sat Aug 05 20:30:41 2017 +0000
+++ b/usr.bin/Makefile  Mon Aug 07 14:27:11 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.229 2017/05/21 15:28:42 riastradh Exp $
+#      $NetBSD: Makefile,v 1.229.4.1 2017/08/07 14:27:11 perseant Exp $
 #      from: @(#)Makefile      8.3 (Berkeley) 1/7/94
 
 .include <bsd.own.mk>
@@ -15,7 +15,7 @@
        getopt gettext gprof \
        head hexdump iconv id indent infocmp innetgr ipcrm ipcs join jot \
        kdump ktrace ktruss lam last lastcomm ldd leave \
-       locale locate lock logger login logname look lorder m4 \
+       locale localedef locate lock logger login logname look lorder m4 \
        machine mail make man menuc mesg midiplay midirecord mixerctl \
        mkcsmapper mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage \
        moduli msgc msgs \