diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:14 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:14 +0000 |
| commit | f0a1839fe7efb47aea6e8fcaf0e35ad3dff4187d (patch) | |
| tree | c1690c2f73ecbd829bd62ee3f5d2a07bd56d38a8 | |
| parent | c80ab61ac44bbf6054def9c08ec0a23809c1c363 (diff) | |
| download | ruby-f0a1839fe7efb47aea6e8fcaf0e35ad3dff4187d.tar.gz ruby-f0a1839fe7efb47aea6e8fcaf0e35ad3dff4187d.tar.xz ruby-f0a1839fe7efb47aea6e8fcaf0e35ad3dff4187d.zip | |
merges r20353 from trunk into ruby_1_9_1.
* strftime.c (rb_strftime): "%^P" should convert to upper case.
[ruby-dev:37180]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | strftime.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Nov 25 10:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * strftime.c (rb_strftime): "%^P" should convert to upper case. + [ruby-dev:37180] + Tue Nov 25 07:51:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d". diff --git a/strftime.c b/strftime.c index 98e193c39..5002c56c0 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); } |