diff options
| author | Gerald Carter <jerry@samba.org> | 2007-02-28 14:35:26 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-02-28 14:35:26 +0000 |
| commit | 80236f0d60ce013134c1ed5422d148e541f70a4f (patch) | |
| tree | f71326fa71c0323e6b5d87b75b289d0608480f87 /source/lib/iconv.c | |
| parent | f05f5dce39b11e937fb19270b7bcc888582edf35 (diff) | |
| download | samba-80236f0d60ce013134c1ed5422d148e541f70a4f.tar.gz samba-80236f0d60ce013134c1ed5422d148e541f70a4f.tar.xz samba-80236f0d60ce013134c1ed5422d148e541f70a4f.zip | |
r21585: Start syncing the monster that will become 3.0.25pre1
Still todo:
* release notes
* few minor outstanding patches
* additional idmap man pages
Diffstat (limited to 'source/lib/iconv.c')
| -rw-r--r-- | source/lib/iconv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/lib/iconv.c b/source/lib/iconv.c index c96243633fb..6e040b77f17 100644 --- a/source/lib/iconv.c +++ b/source/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. |