Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Dec 2020 19:06:59 +0000 (UTC)
From:      =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r368611 - head/usr.bin/calendar
Message-ID:  <202012131906.0BDJ6xvJ020486@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012131906.0BDJ6xvJ020486>