From d286a6b30b0343bbbf363007eeddc99c8128f3ca Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 30 Aug 2000 07:58:01 +0000 Subject: [PATCH] Merge in changes from GNU libc. --- lib/strftime.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/strftime.c b/lib/strftime.c index 6ab2be7d4b..c3b2148609 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -98,8 +98,8 @@ extern char *tzname[]; # define L_(Str) L##Str # define NLW(Sym) _NL_W##Sym -# define MEMCPY(d, s, n) wmemcpy (d, s, n) -# define STRLEN(s) wcslen (s) +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) +# define STRLEN(s) __wcslen (s) #else # define CHAR_T char @@ -752,6 +752,11 @@ my_strftime (s, maxsize, format, tp ut_argument) case L_('b'): case L_('h'): /* POSIX.2 extension. */ + if (change_case) + { + to_uppcase = 1; + to_lowcase = 0; + } if (modifier != 0) goto bad_format; #if defined _NL_CURRENT || !HAVE_STRFTIME @@ -848,7 +853,7 @@ my_strftime (s, maxsize, format, tp ut_argument) if (era) { # ifdef COMPILE_WIDE - size_t len = wcslen (era->era_wname); + size_t len = __wcslen (era->era_wname); cpy (len, era->era_wname); # else size_t len = strlen (era->era_name); -- 2.30.2