From 9fbdeb410d7d7e7383b20b71da4dd4bd481a8808 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 9 Jan 2005 20:23:44 +0000 Subject: Update. * elf/dl-runtime.c: Inlcude . * elf/Makefile (headers): Add bits/link.h. 2005-01-09 Andreas Schwab * elf/rtld.c (dl_main): Create main_map with __RTLD_OPENEXEC. 2005-01-09 Andreas Jaeger * 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 * elf/Makefile (generated): Add tst-pie1{,.out,.o}. 2005-01-09 Ulrich Drepper --- time/strptime_l.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'time') 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) -- cgit v1.2.3-70-g09d2