diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-01-09 20:23:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-09 20:23:44 +0000 |
| commit | 9fbdeb410d7d7e7383b20b71da4dd4bd481a8808 (patch) | |
| tree | 234bd8367c8199b96e4cb369a119ad5e42bc5f1b /time/strptime_l.c | |
| parent | 217fc747ff8ce46df736f0b975d7082753219391 (diff) | |
Update.
* elf/dl-runtime.c: Inlcude <sys/param.h>.
* elf/Makefile (headers): Add bits/link.h.
2005-01-09 Andreas Schwab <schwab@suse.de>
* elf/rtld.c (dl_main): Create main_map with __RTLD_OPENEXEC.
2005-01-09 Andreas Jaeger <aj@suse.de>
* time/strptime_l.c (__strptime_internal): Add braces to avoid
warning.
* sysdeps/x86_64/bits/link.h: Use vector_size for GCC 4.0.
* elf/rtld.c (dl_main): Call _dl_add_to_slotinfo only if USE_TLS.
2005-01-08 Jakub Jelinek <jakub@redhat.com>
* elf/Makefile (generated): Add tst-pie1{,.out,.o}.
2005-01-09 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'time/strptime_l.c')
| -rw-r--r-- | time/strptime_l.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/time/strptime_l.c b/time/strptime_l.c index df98099f0a..7deaef8fb4 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2005 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 @@ -539,11 +539,13 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) } #endif if (!match_string (HERE_AM_STR, rp)) - if (match_string (HERE_PM_STR, rp)) - is_pm = 1; - else - return NULL; - break; + { + if (match_string (HERE_PM_STR, rp)) + is_pm = 1; + else + return NULL; + break; + } case 'r': #ifdef _NL_CURRENT if (*decided != raw) |