[src/trunk]: src/external/bsd/nvi/dist/common Protect iconv stuffs by USE_WID...

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

details:   https://anonhg.NetBSD.org/src/rev/da718a276189
branches:  trunk
changeset: 357494:da718a276189
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Nov 13 04:21:55 2017 +0000

description:
Protect iconv stuffs by USE_WIDECHAR in addition to USE_ICONV.

diffstat:

 external/bsd/nvi/dist/common/conv.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 4ddf12b4fe78 -r da718a276189 external/bsd/nvi/dist/common/conv.c
--- a/external/bsd/nvi/dist/common/conv.c       Mon Nov 13 04:09:41 2017 +0000
+++ b/external/bsd/nvi/dist/common/conv.c       Mon Nov 13 04:21:55 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conv.c,v 1.6 2017/11/10 18:08:11 rin Exp $ */
+/*     $NetBSD: conv.c,v 1.7 2017/11/13 04:21:55 rin Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: conv.c,v 1.27 2001/08/18 21:41:41 skimo Exp  (Berkeley) Date: 2001/08/18 21:41:41 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: conv.c,v 1.6 2017/11/10 18:08:11 rin Exp $");
+__RCSID("$NetBSD: conv.c,v 1.7 2017/11/13 04:21:55 rin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -33,7 +33,7 @@
 
 #include "common.h"
 
-#ifdef USE_ICONV
+#if defined(USE_WIDECHAR) && defined(USE_ICONV)
 #include <langinfo.h>
 #include <iconv.h>
 
@@ -365,11 +365,11 @@
        sp->conv.file2int = fe_char2int;
        sp->conv.int2file = fe_int2char;
        sp->conv.input2int = ie_char2int;
-#endif
 #ifdef USE_ICONV
        o_set(sp, O_FILEENCODING, OS_STRDUP, nl_langinfo(CODESET), 0);
        o_set(sp, O_INPUTENCODING, OS_STRDUP, nl_langinfo(CODESET), 0);
 #endif
+#endif
     }
 }