Merge in changes from GNU libc.

diff --git a/lib/strftime.c b/lib/strftime.c
index 6ab2be7d4b1a3ef56d8f7c8d1126a2c0f26c31cb..c3b2148609110b01141833fa5b60f1163faac3a2 100644 (file)
--- 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);