summaryrefslogtreecommitdiffhomepage
path: root/coreutils/cal.c
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 /coreutils/cal.c
parentaa167556cd2954bb9a9fb0a005178462087a4600 (diff)
unicode: s/FEATURE_ASSUME_UNICODE/UNICODE_SUPPORT, add UNICODE_USING_LOCALE
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/cal.c')
-rw-r--r--coreutils/cal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c
index 79fe074f8..c98229cb0 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -87,8 +87,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
/* "Su Mo Tu We Th Fr Sa" */
/* -j heading: */
/* " Su Mo Tu We Th Fr Sa" */
- char day_headings[ENABLE_FEATURE_ASSUME_UNICODE ? 28 * 6 : 28];
- IF_FEATURE_ASSUME_UNICODE(char *hp = day_headings;)
+ char day_headings[ENABLE_UNICODE_SUPPORT ? 28 * 6 : 28];
+ IF_UNICODE_SUPPORT(char *hp = day_headings;)
char buf[40];
init_unicode();
@@ -134,7 +134,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
zero_tm.tm_wday = i;
/* abbreviated weekday name according to locale */
strftime(buf, sizeof(buf), "%a", &zero_tm);
-#if ENABLE_FEATURE_ASSUME_UNICODE
+#if ENABLE_UNICODE_SUPPORT
if (julian)
*hp++ = ' ';
{
@@ -149,7 +149,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
#endif
}
} while (++i < 12);
- IF_FEATURE_ASSUME_UNICODE(hp[-1] = '\0';)
+ IF_UNICODE_SUPPORT(hp[-1] = '\0';)
if (month) {
unsigned row, len, days[MAXDAYS];