diff options
| author | Wayne Davison <wayned@users.sourceforge.net> | 2005-08-16 23:18:06 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@users.sourceforge.net> | 2005-08-16 23:18:06 +0000 |
| commit | 4f7e317503d5b7ae08b02040429bb6fc0847fc15 (patch) | |
| tree | 863871d9228349581c32e09a83a6302e8a939020 | |
| parent | 27c6fd0ad20cb7e5f4c4b80bb49193fd33e1f203 (diff) | |
| download | zsh-4f7e317503d5b7ae08b02040429bb6fc0847fc15.tar.gz zsh-4f7e317503d5b7ae08b02040429bb6fc0847fc15.tar.xz zsh-4f7e317503d5b7ae08b02040429bb6fc0847fc15.zip | |
Now that ZLE_UNICODE_SUPPORT is defined by configure, tweaked the
multibyte #ifdef logic a little here to honor its setting.
| -rw-r--r-- | Src/system.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Src/system.h b/Src/system.h index 0c3215d84..45f6cb6d1 100644 --- a/Src/system.h +++ b/Src/system.h @@ -692,21 +692,17 @@ extern short ospeed; #endif /* - * This is a subset of ZLE_UNICODE_SUPPORT. It is not all that likely - * that only the subset is supported, however it's easy to make the - * \u and \U escape sequences work with just the following. + * The ZLE_UNICODE_SUPPORT configure-define specifies that we want to enable + * complete Unicode conversion between wide characters and multibyte strings. */ -#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && defined (__STDC_ISO_10646__) -# include <wchar.h> -# include <wctype.h> - +#if defined ZLE_UNICODE_SUPPORT \ + || (defined HAVE_WCHAR_H && defined HAVE_WCTOMB && defined __STDC_ISO_10646__) /* - * More stringent requirements to enable complete Unicode conversion - * between wide characters and multibyte strings. + * If ZLE_UNICODE_SUPPORT is not defined, these includes provide a subset of + * Unicode support that makes the \u and \U printf escape sequences work. */ -#if defined(HAVE_MBRTOWC) && defined(HAVE_WCRTOMB) -#define ZLE_UNICODE_SUPPORT 1 -#endif +# include <wchar.h> +# include <wctype.h> #else # ifdef HAVE_LANGINFO_H # include <langinfo.h> |