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
This commit is contained in:
parent
8a428dfecb
commit
d87cb51f56
@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$");
|
|||||||
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
|
#include <langinfo.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#ifdef WITH_ICONV
|
#ifdef WITH_ICONV
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <langinfo.h>
|
|
||||||
|
|
||||||
static iconv_t conv = (iconv_t)-1;
|
static iconv_t conv = (iconv_t)-1;
|
||||||
static char *currentEncoding = NULL;
|
static char *currentEncoding = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user