aboutsummaryrefslogtreecommitdiff
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)
downloadbusybox-w32-19158a837df5093a2d655536424412bac2b07467.tar.gz
busybox-w32-19158a837df5093a2d655536424412bac2b07467.tar.bz2
busybox-w32-19158a837df5093a2d655536424412bac2b07467.zip
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)
87 /* "Su Mo Tu We Th Fr Sa" */ 87 /* "Su Mo Tu We Th Fr Sa" */
88 /* -j heading: */ 88 /* -j heading: */
89 /* " Su Mo Tu We Th Fr Sa" */ 89 /* " Su Mo Tu We Th Fr Sa" */
90 char day_headings[ENABLE_FEATURE_ASSUME_UNICODE ? 28 * 6 : 28]; 90 char day_headings[ENABLE_UNICODE_SUPPORT ? 28 * 6 : 28];
91 IF_FEATURE_ASSUME_UNICODE(char *hp = day_headings;) 91 IF_UNICODE_SUPPORT(char *hp = day_headings;)
92 char buf[40]; 92 char buf[40];
93 93
94 init_unicode(); 94 init_unicode();
@@ -134,7 +134,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
134 zero_tm.tm_wday = i; 134 zero_tm.tm_wday = i;
135 /* abbreviated weekday name according to locale */ 135 /* abbreviated weekday name according to locale */
136 strftime(buf, sizeof(buf), "%a", &zero_tm); 136 strftime(buf, sizeof(buf), "%a", &zero_tm);
137#if ENABLE_FEATURE_ASSUME_UNICODE 137#if ENABLE_UNICODE_SUPPORT
138 if (julian) 138 if (julian)
139 *hp++ = ' '; 139 *hp++ = ' ';
140 { 140 {
@@ -149,7 +149,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
149#endif 149#endif
150 } 150 }
151 } while (++i < 12); 151 } while (++i < 12);
152 IF_FEATURE_ASSUME_UNICODE(hp[-1] = '\0';) 152 IF_UNICODE_SUPPORT(hp[-1] = '\0';)
153 153
154 if (month) { 154 if (month) {
155 unsigned row, len, days[MAXDAYS]; 155 unsigned row, len, days[MAXDAYS];