From 1cb6b555a864f401c8a2ba75814e982b66a62971 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 3 Jul 2008 12:21:19 +0000
Subject: Updated to fedora-glibc-20080703T1203

---
 time/strptime_l.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'time')

diff --git a/time/strptime_l.c b/time/strptime_l.c
index 59a557c22b..c4a0638fff 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2004, 2005, 2007, 2008 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
@@ -33,22 +33,13 @@
 #endif
 
 
-#ifndef __P
-# if defined __GNUC__ || (defined __STDC__ && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
-
-
 #if ! HAVE_LOCALTIME_R && ! defined localtime_r
 # ifdef _LIBC
 #  define localtime_r __localtime_r
 # else
 /* Approximate localtime_r as best we can in its absence.  */
 #  define localtime_r my_localtime_r
-static struct tm *localtime_r __P ((const time_t *, struct tm *));
+static struct tm *localtime_r (const time_t *, struct tm *);
 static struct tm *
 localtime_r (t, tp)
      const time_t *t;
@@ -951,7 +942,6 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
 		  else
 		    {
 		      s.decided = loc;
-		      s.era_cnt = -1;
 		      break;
 		    }
 
-- 
cgit v1.2.3