diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
| commit | bcc37abc0abd384886ad532b3e13c3c9579da0c1 (patch) | |
| tree | e67f114b1e2098264a6737bdb79cfaa248b4e0b2 /libc/time | |
| parent | 7bda88f34e2e6e190fe3d0ab32750f8a2cb89a2d (diff) | |
Merge changes between r9152 and r9169 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9170 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/time')
| -rw-r--r-- | libc/time/strftime_l.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libc/time/strftime_l.c b/libc/time/strftime_l.c index 2f9668495..fcc57d59f 100644 --- a/libc/time/strftime_l.c +++ b/libc/time/strftime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -888,8 +888,6 @@ __strftime_internal (s, maxsize, format, tp, tzset_called ut_argument #endif case L_('C'): - if (modifier == L_('O')) - goto bad_format; if (modifier == L_('E')) { #if (! _LIBC || __OPTION_EGLIBC_LOCALE_CODE) && HAVE_STRUCT_ERA_ENTRY |