aboutsummaryrefslogtreecommitdiff
path: root/include/unicode.h
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-26 14:06:56 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-03-26 14:06:56 +0100
commit19158a837df5093a2d655536424412bac2b07467 (patch)
tree3f3ce9c808e05dbf8dd38292f4c2db52cb73b429 /include/unicode.h
parentaa167556cd2954bb9a9fb0a005178462087a4600 (diff)
downloadbusybox-19158a837df5093a2d655536424412bac2b07467.tar.gz
unicode: s/FEATURE_ASSUME_UNICODE/UNICODE_SUPPORT, add UNICODE_USING_LOCALE
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include/unicode.h')
-rw-r--r--include/unicode.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/unicode.h b/include/unicode.h
index deb4022c3..4e2927297 100644
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -5,7 +5,7 @@
#ifndef UNICODE_H
#define UNICODE_H 1
-#if ENABLE_LOCALE_SUPPORT
+#if ENABLE_UNICODE_USING_LOCALE
# include <wchar.h>
# include <wctype.h>
#endif
@@ -21,7 +21,7 @@ enum {
#define unicode_bidi_isrtl(wc) 0
#define unicode_bidi_is_neutral_wchar(wc) (wc <= 126 && !isalpha(wc))
-#if !ENABLE_FEATURE_ASSUME_UNICODE
+#if !ENABLE_UNICODE_SUPPORT
# define unicode_strlen(string) strlen(string)
# define unicode_status UNICODE_OFF
@@ -50,7 +50,7 @@ char* FAST_FUNC unicode_conv_to_printable(uni_stat_t *stats, const char *src);
char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth);
char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width);
-# if ENABLE_LOCALE_SUPPORT
+# if ENABLE_UNICODE_USING_LOCALE
extern uint8_t unicode_status;
void init_unicode(void) FAST_FUNC;
@@ -102,9 +102,9 @@ int unicode_bidi_is_neutral_wchar(wint_t wc) FAST_FUNC;
# endif
-# endif /* !LOCALE_SUPPORT */
+# endif /* !UNICODE_USING_LOCALE */
-#endif /* FEATURE_ASSUME_UNICODE */
+#endif /* UNICODE_SUPPORT */
POP_SAVED_FUNCTION_VISIBILITY