mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-10-02 00:41:44 +02:00
Now that ZLE_UNICODE_SUPPORT is defined by configure, tweaked the
multibyte #ifdef logic a little here to honor its setting.
This commit is contained in:
parent
27c6fd0ad2
commit
4f7e317503
20
Src/system.h
20
Src/system.h
@ -692,21 +692,17 @@ extern short ospeed;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is a subset of ZLE_UNICODE_SUPPORT. It is not all that likely
|
* The ZLE_UNICODE_SUPPORT configure-define specifies that we want to enable
|
||||||
* that only the subset is supported, however it's easy to make the
|
* complete Unicode conversion between wide characters and multibyte strings.
|
||||||
* \u and \U escape sequences work with just the following.
|
*/
|
||||||
|
#if defined ZLE_UNICODE_SUPPORT \
|
||||||
|
|| (defined HAVE_WCHAR_H && defined HAVE_WCTOMB && defined __STDC_ISO_10646__)
|
||||||
|
/*
|
||||||
|
* 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_WCHAR_H) && defined(HAVE_WCTOMB) && defined (__STDC_ISO_10646__)
|
|
||||||
# include <wchar.h>
|
# include <wchar.h>
|
||||||
# include <wctype.h>
|
# include <wctype.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* More stringent requirements to enable complete Unicode conversion
|
|
||||||
* between wide characters and multibyte strings.
|
|
||||||
*/
|
|
||||||
#if defined(HAVE_MBRTOWC) && defined(HAVE_WCRTOMB)
|
|
||||||
#define ZLE_UNICODE_SUPPORT 1
|
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
# ifdef HAVE_LANGINFO_H
|
# ifdef HAVE_LANGINFO_H
|
||||||
# include <langinfo.h>
|
# include <langinfo.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user