diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-11-06 23:03:08 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-11-06 23:03:08 +0000 |
| commit | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (patch) | |
| tree | 27fe47c83800c73d61262ea4e70b211f6753e516 /libc/time/tst-strptime.c | |
| parent | fe2ed5aaa408e1ab996a9fe1595a05634208a79c (diff) | |
| download | eglibc2-036dfd44bcc8ed8e97dcd9c763f61d3b59796941.tar.gz | |
Merge changes between r24305 and r24468 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24469 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/time/tst-strptime.c')
| -rw-r--r-- | libc/time/tst-strptime.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libc/time/tst-strptime.c b/libc/time/tst-strptime.c index 21fbb6364..193f7dbe0 100644 --- a/libc/time/tst-strptime.c +++ b/libc/time/tst-strptime.c @@ -41,6 +41,7 @@ static const struct { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 }, { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 }, { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 }, + { "C", "2001 EST 21 Mon", "%Y %Z %W %a", 1, 140, 4, 21 }, { "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 }, { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p", 6, 0, 0, 1 }, |