From owner-svn-src-all@freebsd.org  Sun Dec 13 19:07:00 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 33E944C0EC9;
 Sun, 13 Dec 2020 19:07:00 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CvDXh11fVz4mWP;
 Sun, 13 Dec 2020 19:07:00 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1608E1485D;
 Sun, 13 Dec 2020 19:07:00 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BDJ6xUa020487;
 Sun, 13 Dec 2020 19:06:59 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BDJ6xvJ020486;
 Sun, 13 Dec 2020 19:06:59 GMT (envelope-from se@FreeBSD.org)
Message-Id: <202012131906.0BDJ6xvJ020486@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
Date: Sun, 13 Dec 2020 19:06:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r368611 - head/usr.bin/calendar
X-SVN-Group: head
X-SVN-Commit-Author: se
X-SVN-Commit-Paths: head/usr.bin/calendar
X-SVN-Commit-Revision: 368611
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Dec 2020 19:07:00 -0000

Author: se
Date: Sun Dec 13 19:06:59 2020
New Revision: 368611
URL: https://svnweb.freebsd.org/changeset/base/368611

Log:
  Fix WITHOUT_ICONV build
  
  Move the include of langinfo.h out of the WITH_ICONV condition block,
  since it is not dependent on ICONV. This was correct when nl_langinfo()
  had only been called in the WITH_ICONV case, but that is no longer the
  case.
  
  Submitted by:	yuripv

Modified:
  head/usr.bin/calendar/events.c

Modified: head/usr.bin/calendar/events.c
==============================================================================
--- head/usr.bin/calendar/events.c	Sun Dec 13 19:03:38 2020	(r368610)
+++ head/usr.bin/calendar/events.c	Sun Dec 13 19:06:59 2020	(r368611)
@@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/time.h>
 #include <err.h>
+#include <langinfo.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef WITH_ICONV
 #include <iconv.h>
 #include <errno.h>
-#include <langinfo.h>
 
 static iconv_t conv = (iconv_t)-1;
 static char *currentEncoding = NULL;