summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/iconv.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index c96243633f..6e040b77f1 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -128,6 +128,7 @@ static void lazy_initialize_iconv(void)
}
}
+#ifdef HAVE_NATIVE_ICONV
/* if there was an error then reset the internal state,
this ensures that we don't have a shift state remaining for
character sets like SJIS */
@@ -135,7 +136,6 @@ static size_t sys_iconv(void *cd,
const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
-#ifdef HAVE_NATIVE_ICONV
size_t ret = iconv((iconv_t)cd,
(char **)inbuf, inbytesleft,
outbuf, outbytesleft);
@@ -145,11 +145,8 @@ static size_t sys_iconv(void *cd,
errno = saved_errno;
}
return ret;
-#else
- errno = EINVAL;
- return -1;
-#endif
}
+#endif
/**
* This is a simple portable iconv() implementaion.