From a689e57283121d1e3ab2a9697459839828317b17 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Nov 2008 04:42:11 +0000
Subject: * strftime.c (rb_strftime): "%^P" should convert to upper case.  
 [ruby-dev:37180]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 strftime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'strftime.c')

diff --git a/strftime.c b/strftime.c
index 98e193c396..5002c56c06 100644
--- a/strftime.c
+++ b/strftime.c
@@ -404,7 +404,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
 		case 'p':	/* AM or PM based on 12-hour clock */
 		case 'P':	/* am or pm based on 12-hour clock */
 			if ((*format == 'p' && (flags & BIT_OF(CHCASE))) ||
-			    (*format == 'P' && !(flags & BIT_OF(CHCASE)))) {
+			    (*format == 'P' && !(flags & (BIT_OF(CHCASE)|BIT_OF(UPPER))))) {
 				flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE));
 				flags |= BIT_OF(LOWER);
 			}
-- 
cgit v1.2.3