1
0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 05:24:23 +01:00

22085 and back off 22075: include langinfo.h to get iconv

This commit is contained in:
Peter Stephenson 2005-12-15 14:51:39 +00:00
parent b5a83cc754
commit f7037211ad
3 changed files with 12 additions and 10 deletions

@ -1,5 +1,8 @@
2005-12-15 Peter Stephenson <pws@csr.com>
* 22085 and back off 22075: Src/system.h, Src/utils.c: we
may need <langinfo.h> even with MULTIBYTE_SUPPORT to get iconv.
* 22076: INSTALL, Etc/FAQ.yo: more information on multibyte
handling.

@ -703,11 +703,10 @@ extern short ospeed;
*/
# include <wchar.h>
# include <wctype.h>
#else
# ifdef HAVE_LANGINFO_H
# include <langinfo.h>
# ifdef HAVE_ICONV
# include <iconv.h>
# endif
# endif
#endif
#ifdef HAVE_LANGINFO_H
# include <langinfo.h>
# ifdef HAVE_ICONV
# include <iconv.h>
# endif
#endif

@ -3918,7 +3918,7 @@ dquotedzputs(char const *s, FILE *stream)
}
#endif
# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && !defined(__STDC_ISO_10646__) && !defined(MULTIBYTE_SUPPORT)
# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && !defined(__STDC_ISO_10646__)
/* Convert a character from UCS4 encoding to UTF-8 */
static size_t
@ -3983,7 +3983,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
char svchar = '\0';
int meta = 0, control = 0;
int i;
#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && (defined(__STDC_ISO_10646__) || defined(MULTIBYTE_SUPPORT))
#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && defined(__STDC_ISO_10646__)
wint_t wval;
size_t count;
#else
@ -4092,7 +4092,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
*misc = wval;
return s+1;
}
#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && (defined(__STDC_ISO_10646__) || defined(MULTIBYTE_SUPPORT))
#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && defined(__STDC_ISO_10646__)
count = wctomb(t, (wchar_t)wval);
if (count == (size_t)-1) {
zerr("character not in range", NULL, 0);