X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrftime.c;h=c3b2148609110b01141833fa5b60f1163faac3a2;hb=4d2ba1df0fd6135c58ce1dc16e8e28ba510e700e;hp=f3dcd77f4aa97479b15b64cea1dd3ea23c51de24;hpb=4c81c55a237f410592a5194f0b5419a6b7a2bfa1;p=gnulib.git

diff --git a/lib/strftime.c b/lib/strftime.c
index f3dcd77f4..c3b214860 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
@@ -822,6 +827,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	       "#define strftime rpl_strftime".  */
 # ifdef strftime
 #  undef strftime
+	    size_t strftime ();
 # endif
 
 	    *u++ = '%';
@@ -847,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);